Merge branch 'develop' into feature/ci-s3-fix

.env

@@ -1,6 +1,5 @@
-OPENSHOCK_API_DOMAIN=api.shocklink.net
+OPENSHOCK_API_DOMAIN=api.openshock.app
 OPENSHOCK_FW_CDN_DOMAIN=firmware.openshock.org
-OPENSHOCK_FW_VERSION=0.0.0-unknown
 OPENSHOCK_FW_HOSTNAME=OpenShock
 OPENSHOCK_FW_AP_PREFIX=OpenShock-
 OPENSHOCK_URI_BUFFER_SIZE=256

.env.development

@@ -1,4 +1,3 @@
 # Included by frontend/ (DO NOT RENAME THIS FILE!)
 # Intended for development builds (locally).
 LOG_LEVEL=VERBOSE
-OPENSHOCK_FW_VERSION=0.0.0-local

.github/actions/build-firmware/action.yml

@@ -1,9 +1,6 @@
 name: build-firmware
 description: Builds the firmware partitions and uploads them as an artifact
 inputs:
-  python-version:
-    required: true
-    description: 'Python version to use'
   board:
     required: true
     description: 'Board name to build'
@@ -31,7 +28,6 @@ runs:
 
     - uses: actions/setup-python@v5
       with:
-        python-version: ${{ inputs.python-version }}
         cache: 'pip'
 
     - name: Install python dependencies

.github/actions/build-staticfs/action.yml

@@ -1,9 +1,9 @@
 name: build-staticfs
 description: Builds the static filesystem partition and uploads it as an artifact
 inputs:
-  python-version:
-    description: 'Python version to use'
+  version:
     required: true
+    description: 'Current firmware version'
   skip-checkout:
     description: 'If true, skips checkout'
     required: false
@@ -25,7 +25,6 @@ runs:
 
     - uses: actions/setup-python@v5
       with:
-        python-version: ${{ inputs.python-version }}
         cache: 'pip'
 
     - name: Install dependencies
@@ -41,6 +40,11 @@ runs:
     - name: Build filesystem partition
       shell: bash
       run: pio run --target buildfs -e fs
+      env:
+        OPENSHOCK_FW_VERSION: ${{ inputs.version }}
+        OPENSHOCK_FW_GIT_REF: ${{ github.ref }}
+        OPENSHOCK_FW_GIT_COMMIT: ${{ github.sha }}
+        OPENSHOCK_FW_BUILD_DATE: ${{ github.event.head_commit.timestamp }}
 
     - name: Rename partition binary
       shell: bash

.github/actions/merge-partitions/action.yml

@@ -1,9 +1,6 @@
 name: merge-partitions
 description: Merges multiple partitions into a single flashable binary
 inputs:
-  python-version:
-    description: 'Python version to use'
-    required: true
   version:
     description: 'Version of the firmware'
     required: true
@@ -28,12 +25,11 @@ runs:
 
     - uses: actions/setup-python@v5
       with:
-        python-version: ${{ inputs.python-version }}
         cache: 'pip'
 
     - name: Install dependencies
       shell: bash
-      run: pip install esptool
+      run: pip install -r requirements.txt
 
     - name: Download static filesystem partition
       uses: actions/download-artifact@v4