24-release-1-1-5

InamataCo · Jan 1, 2024 · 90780f4 · 90780f4
1 parent a07cb5c
commit 90780f4
Show file tree

Hide file tree

Showing 11 changed files with 132 additions and 128 deletions.
diff --git a/.gitlab/issue_templates/Release.md b/.gitlab/issue_templates/Release.md
@@ -1,11 +1,13 @@
 ### Release Process
 
-- [ ] Check if translations are up-to-date (`build.sh i18n_u`)
-- [ ] Run build script (`build.sh -P bump=<major/minor/patch>`)
-- [ ] Push commit and tags (`git push && git push --tags`)
+- [ ] Set issue and MR title as `<Major/Minor/Patch> release`
+- [ ] Check if translations are up-to-date (`./build.sh i18n_u`)
+- [ ] Run build script (`./build.sh -P bump=<major/minor/patch>`)
+- [ ] Push commit and merge MR (no merge message)
+- [ ] Tag squashed commit (`git tag vX.Y.Z && git push --tags`)
 - [ ] Test on Linux VMs (Ubuntu 22.04, 20.04 and Kubuntu 22.04)
 - [ ] Test on Linux Wayland session and X
-- [ ] Create GitHub release with text (`build.py text`)
+- [ ] Create GitHub release with text (`./build.py text`)
 - [ ] Upload Linux binaries
 - [ ] Upload Windows binaries
 - [ ] Promote Snap package to release channel

diff --git a/publish/build.py b/publish/build.py
@@ -262,7 +262,7 @@ def update_version_files(project: Project, logger: Logger):
     root_dir = project.get_mandatory_property("root_dir")
     for file in version_files:
         logger.info(f"Updating version in: {file.path.relative_to(root_dir)}")
-        file.update_version()
+        file.update_version(project.get_mandatory_property("next_version"))
 
 
 @task(description="Build binaries for current platform.")
@@ -298,10 +298,10 @@ def build(project: Project, logger: Logger):
             build_inno(project, logger)
 
     if bump_and_commit:
-        logger.info("Creating git release commit")
+        subprocess.run("git add .".split())
         commit_title = f"Release {next_version}"
-        subprocess.run([f"git commit -m '{commit_title}'".split()])
-        subprocess.run([f"git tag v{next_version}".split()])
+        subprocess.run(["git", "commit", "-m", f"{commit_title}"])
+        logger.info(f"Release tag : v{next_version}")
 
 
 @task(description="Sync Poetry and delete build / dist files.")

diff --git a/publish/main.iss b/publish/main.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Inamata Flasher"
-#define MyAppVersion "1.1.4"
+#define MyAppVersion "1.1.5"
 #define MyAppPublisher "Silent Wind GmbH"
 #define MyAppURL "https://inamata.co"
 #define MyAppExeName "inamata_flasher.exe"

diff --git a/publish/version_updaters.py b/publish/version_updaters.py
@@ -85,7 +85,9 @@ def path(self) -> Path:
     @property
     def patterns(self) -> list[Pattern]:
         return [
-            Pattern(r=r"^#define MyAppVersion .*$", f="#define MyAppVersion {version}")
+            Pattern(
+                r=r"^#define MyAppVersion .*$", f='#define MyAppVersion "{version}"'
+            )
         ]
 
 

diff --git a/publish/windows/file_version_info.txt b/publish/windows/file_version_info.txt
@@ -6,8 +6,8 @@ VSVersionInfo(
   ffi=FixedFileInfo(
     # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)
     # Set not needed items to zero 0.
-    filevers=(1, 1, 4, 0),
-    prodvers=(1, 1, 4, 0),
+    filevers=(1, 1, 5, 0),
+    prodvers=(1, 1, 5, 0),
     # Contains a bitmask that specifies the valid bits 'flags'r
     mask=0x0,
     # Contains a bitmask that specifies the Boolean attributes of the file.
@@ -34,8 +34,8 @@ VSVersionInfo(
         StringStruct('InternalName', 'inamata-flasher'),
         StringStruct('OriginalFilename', 'inamata_flasher.exe'),
         StringStruct('ProductName', 'Inamata Flasher'),
-        StringStruct('FileVersion', '1.1.4.windows'),
-        StringStruct('ProductVersion', '1.1.4.windows'),
+        StringStruct('FileVersion', '1.1.5.windows'),
+        StringStruct('ProductVersion', '1.1.5.windows'),
         StringStruct('LegalCopyright', 'Apache-2.0')])
       ]), 
     VarFileInfo([VarStruct('Translation', [1033, 1200, 1031, 1200, 1036, 1200])])

diff --git a/pyproject.toml b/pyproject.toml
@@ -19,7 +19,7 @@ license = "Apache-2.0"
 name = "inamata_flasher"
 packages = [{include = "esp_idf/..", from = "src"}]
 readme = "README.md"
-version = "1.1.4"
+version = "1.1.5"
 
 [tool.poetry.dependencies]
 PySide6 = "~=6.6.0"

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -17,7 +17,7 @@ description: |
   Optional:
     sudo snap connect inamata-flasher:password-manager-service
 license: Apache-2.0
-version: 1.1.4
+version: 1.1.5
 grade: stable
 confinement: strict
 base: core22

diff --git a/src/main.py b/src/main.py
@@ -31,7 +31,7 @@
 from server_model import ServerModel
 from wifi_model import WiFiModel
 
-__version__ = "1.1.4"
+__version__ = "1.1.5"
 
 
 def main():

diff --git a/translations/main_de_DE.ts b/translations/main_de_DE.ts
@@ -90,7 +90,7 @@ Für Snap-Installationen:
 <context>
     <name>help</name>
     <message>
-        <location filename="../src/controller.py" line="1401"/>
+        <location filename="../src/controller.py" line="1404"/>
         <source>1. Enable serial port access (part 1)
   - Run in a terminal: sudo usermod -a -G dialout $USER
 
@@ -133,7 +133,7 @@ Für Snap-Installationen:
  - https://inamata.co/forum/</translation>
     </message>
     <message>
-        <location filename="../src/controller.py" line="1418"/>
+        <location filename="../src/controller.py" line="1421"/>
         <source>1. Enable serial port access
   - Run in a terminal: sudo usermod -a -G dialout $USER
 
@@ -158,7 +158,7 @@ Für Snap-Installationen:
  - https://inamata.co/forum/</translation>
     </message>
     <message>
-        <location filename="../src/controller.py" line="1430"/>
+        <location filename="../src/controller.py" line="1433"/>
         <source>1. Install the serial driver (CP210x)
   - https://www.silabs.com/documents/public/software/CP210x_Windows_Drivers.zip
   - https://github.com/InamataCo/Flasher#driver-setup-instructions
@@ -188,170 +188,170 @@ Für Snap-Installationen:
         <translation>Systemeinstellungen öffnen</translation>
     </message>
     <message>
-        <location filename="../src/controller.py" line="1214"/>
+        <location filename="../src/controller.py" line="1217"/>
         <source>Setup</source>
         <translation>Einrichtung</translation>
     </message>
     <message>
-        <location filename="../src/controller.py" line="1220"/>
+        <location filename="../src/controller.py" line="1223"/>
         <source>Open the following web page if it does not automatically open.</source>
         <translation>Öffnen Sie die folgende Webseite, falls sie nicht automatisch geöffnet wird.</translation>
     </message>
     <message>
-        <location filename="../src/controller.py" line="1224"/>
+        <location filename="../src/controller.py" line="1227"/>
         <source>Cleared local data</source>
         <translation>Lokale Daten wurden gelöscht</translation>
     </message>
     <message>
-        <location filename="../src/controller.py" line="1230"/>
+        <location filename="../src/controller.py" line="1233"/>
         <source>Cleared secrets, configurations and cached data.</source>
         <translation>Geheimnisse, Konfigurationen und zwischengespeicherte Daten wurden gelöscht.</translation>
     </message>
     <message>
-        <location filename="../src/controller.py" line="1234"/>
+        <location filename="../src/controller.py" line="1237"/>
         <source>Invalid WiFi connection</source>
         <translation>Ungültige WLAN-Verbindung</translation>
     </message>
     <message>
-        <location filename="../src/controller.py" line="1240"/>
+        <location filename="../src/controller.py" line="1243"/>
         <source>The WiFi name (SSID) is blank. Please enter a WiFi name.</source>
         <translation>Der WLAN-Name (SSID) ist leer. Bitte geben Sie einen WLAN-Namen ein.</translation>
     </message>
     <message>
-        <location filename="../src/controller.py" line="1253"/>
+        <location filename="../src/controller.py" line="1256"/>
         <source>Latest</source>
         <comment>Label for latest firmware image</comment>
         <translation>Neueste</translation>
     </message>
     <message>
-        <location filename="../src/controller.py" line="1260"/>
+        <location filename="../src/controller.py" line="1263"/>
         <source>No firmware images found on the server. Check that you have permissions to view firmware images or contact support.</source>
         <translation>Auf dem Server wurden keine Firmware-Images gefunden. Überprüfen Sie, ob Sie berechtigt sind, Firmware-Images anzuzeigen, oder wenden Sie sich an den Support.</translation>
     </message>
     <message>
-        <location filename="../src/controller.py" line="1264"/>
-        <location filename="../src/controller.py" line="1268"/>
+        <location filename="../src/controller.py" line="1267"/>
+        <location filename="../src/controller.py" line="1271"/>
         <source>No firmware images found</source>
         <translation>Keine Firmware-Images gefunden</translation>
     </message>
     <message>
-        <location filename="../src/controller.py" line="1272"/>
+        <location filename="../src/controller.py" line="1275"/>
         <source>Enable Flash Mode</source>
         <translation>Flash-Modus aktivieren</translation>
     </message>
     <message>
-        <location filename="../src/controller.py" line="1279"/>
+        <location filename="../src/controller.py" line="1282"/>
         <source>After closing this message, please press and hold the boot button on the ESP32 until the flash process starts.</source>
         <translation>Nachdem Sie diese Meldung geschlossen haben, halten Sie bitte die Boot-Taste am ESP32 gedrückt, bis der Flash-Vorgang beginnt.</translation>
     </message>
     <message>
-        <location filename="../src/controller.py" line="1283"/>
+        <location filename="../src/controller.py" line="1286"/>
         <source>Finished Flashing</source>
         <translation>Fertig geflascht</translation>
     </message>
     <message>
-        <location filename="../src/controller.py" line="1289"/>
+        <location filename="../src/controller.py" line="1292"/>
         <source>Successfully flashed the microcontroller</source>
         <translation>Erfolgreich den Mikrocontroller geflascht</translation>
     </message>
     <message>
-        <location filename="../src/controller.py" line="1293"/>
+        <location filename="../src/controller.py" line="1296"/>
         <source>No Sites Found</source>
         <translation>Keine Standorte gefunden</translation>
     </message>
     <message>
-        <location filename="../src/controller.py" line="1299"/>
+        <location filename="../src/controller.py" line="1302"/>
         <source>No sites found. Use the web app to create new sites.</source>
         <translation>Keine Standorte gefunden. Verwenden Sie die Web-App, um neue Standorte zu erstellen.</translation>
     </message>
     <message>
-        <location filename="../src/controller.py" line="1303"/>
+        <location filename="../src/controller.py" line="1306"/>
         <source>No controllers found</source>
         <translation>Keine Controller gefunden</translation>
     </message>
     <message>
-        <location filename="../src/controller.py" line="1307"/>
+        <location filename="../src/controller.py" line="1310"/>
         <source>Missing cached data</source>
         <translation>Fehlende gecachte Daten</translation>
     </message>
     <message>
-        <location filename="../src/controller.py" line="1314"/>
+        <location filename="../src/controller.py" line="1317"/>
         <source>Controller not found in cache. Please clear cached data and try again.</source>
         <translation>Controller nicht im Cache gefunden. Bitte löschen Sie die Daten im Cache und versuchen Sie es erneut.</translation>
     </message>
     <message>
-        <location filename="../src/controller.py" line="1318"/>
+        <location filename="../src/controller.py" line="1321"/>
         <source>Get Firmware</source>
         <translation>Firmware herunterladen</translation>
     </message>
     <message>
-        <location filename="../src/controller.py" line="1322"/>
+        <location filename="../src/controller.py" line="1325"/>
         <source>Get Bootloader</source>
         <translation>Bootloader herunterladen</translation>
     </message>
     <message>
-        <location filename="../src/controller.py" line="1326"/>
+        <location filename="../src/controller.py" line="1329"/>
         <source>Registering</source>
         <translation>Registrierung</translation>
     </message>
     <message>
-        <location filename="../src/controller.py" line="1330"/>
+        <location filename="../src/controller.py" line="1333"/>
         <source>Flashing</source>
         <translation>Flaschen</translation>
     </message>
     <message>
-        <location filename="../src/controller.py" line="1334"/>
+        <location filename="../src/controller.py" line="1337"/>
         <source>Missing Input</source>
         <translation>Fehlende Eingaben</translation>
     </message>
     <message>
-        <location filename="../src/controller.py" line="1342"/>
+        <location filename="../src/controller.py" line="1345"/>
         <source>Please select a site or reload if none are available. If the problem persists please update the Inamata Flasher or contact your administrator.</source>
         <translation>Bitte wählen Sie einen Standort aus oder laden Sie sie neu, falls keine verfügbar sind. Wenn das Problem weiterhin besteht, aktualisieren Sie bitte den Inamata Flasher oder kontaktieren Sie Ihren Administrator.</translation>
     </message>
     <message>
-        <location filename="../src/controller.py" line="1364"/>
+        <location filename="../src/controller.py" line="1367"/>
         <source>Please select a firmware version or reload if none are available. If the problem persists please update the Inamata Flasher or contact your administrator.</source>
         <translation>Bitte wählen Sie eine Firmware-Version aus oder laden Sie sie neu, falls keine verfügbar ist. Wenn das Problem weiterhin besteht, aktualisieren Sie bitte den Inamata Flasher oder kontaktieren Sie Ihren Administrator.</translation>
     </message>
     <message>
-        <location filename="../src/controller.py" line="1348"/>
+        <location filename="../src/controller.py" line="1351"/>
         <source>Please enter a name for the new controller.</source>
         <translation>Bitte geben Sie einen Namen für den neuen Controller ein.</translation>
     </message>
     <message>
-        <location filename="../src/controller.py" line="1247"/>
+        <location filename="../src/controller.py" line="1250"/>
         <source>The WiFi name (SSID) is too long. Please enter a WiFi name with 32 characters or fewer.</source>
         <translation>Der WLAN-Name (SSID) ist zu lang. Bitte geben Sie einen WLAN-Namen mit maximal 32 Zeichen ein.</translation>
     </message>
     <message>
-        <location filename="../src/controller.py" line="1356"/>
+        <location filename="../src/controller.py" line="1359"/>
         <source>Please select one or more WiFi connections to be used by the controller. To add or change entries, go to the &apos;Manage WiFi&apos; page.</source>
         <translation>Bitte wählen Sie eine oder mehrere WiFi-Verbindungen aus, die vom Controller verwendet werden sollen. Um Einträge hinzuzufügen oder zu ändern, gehen Sie auf die Seite &quot;WiFi verwalten&quot;.</translation>
     </message>
     <message>
-        <location filename="../src/controller.py" line="1368"/>
+        <location filename="../src/controller.py" line="1371"/>
         <source>Permission error</source>
         <translation>Berechtigungsfehler</translation>
     </message>
     <message>
-        <location filename="../src/controller.py" line="1371"/>
+        <location filename="../src/controller.py" line="1374"/>
         <source>No serial ports found</source>
         <translation>Keine serielle Schnittstellen gefunden</translation>
     </message>
     <message>
-        <location filename="../src/controller.py" line="1373"/>
+        <location filename="../src/controller.py" line="1376"/>
         <source>Found 1 serial port:</source>
         <translation>Eine serielle Schnittstelle gefunden:</translation>
     </message>
     <message>
-        <location filename="../src/controller.py" line="1375"/>
+        <location filename="../src/controller.py" line="1378"/>
         <source>Found %n serial ports:</source>
         <translation>%n serielle Schnittstellen gefunden:</translation>
     </message>
     <message>
         <location filename="../src/about_view.py" line="37"/>
-        <location filename="../src/controller.py" line="1210"/>
+        <location filename="../src/controller.py" line="1213"/>
         <source>About</source>
         <translation>Über</translation>
     </message>