Release 1.1.0

.env

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

.env.development

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

.env.production

@@ -1,3 +1,3 @@
-# Included by WebUI/ (DO NOT RENAME THIS FILE!)
+# Included by frontend/ (DO NOT RENAME THIS FILE!)
 # Intended for all CI firmware builds.
 LOG_LEVEL=INFO

.gitattributes

@@ -0,0 +1,2 @@
+* text=auto eol=lf
+*.txt text eol=lf

.github/ISSUE_TEMPLATE/70-board-test-report.yml

@@ -125,8 +125,8 @@ body:
     attributes:
       label: 'Gateway checks'
       options:
-        - label: 'Can use pairing code to connect board to gateway server'
-        - label: 'Shows up as online on server board list (depends on API, LiveControlGateway and WebUI)'
+        - label: 'Can use linking code to link board to account on gateway server'
+        - label: 'Shows up as online on server board list (depends on API, LiveControlGateway and Captive Portal)'
 
   - type: markdown
     attributes:

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

@@ -1,13 +1,15 @@
-
 name: build-firmware
-description: Builds the firmware
+description: Builds the firmware partitions and uploads them as an artifact
 inputs:
   python-version:
-    description: 'Python version to use'
     required: true
+    description: 'Python version to use'
   board:
+    required: true
     description: 'Board name to build'
+  version:
     required: true
+    description: 'Current firmware version'
   skip-checkout:
     description: 'If true, skips checkout'
     required: false
@@ -30,21 +32,26 @@ runs:
     - uses: actions/setup-python@v4
       with:
         python-version: ${{ inputs.python-version }}
-        cache: "pip"
+        cache: 'pip'
 
-    - name: Install dependencies
+    - name: Install python dependencies
       shell: bash
       run: pip install -r requirements.txt
 
     - name: Build firmware
       working-directory: .
       shell: bash
       run: pio run -e ${{ inputs.board }}
+      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: Upload internal firmware binaries
-      uses: actions/upload-artifact@v3
+    - name: Upload build artifacts
+      uses: actions/upload-artifact@v4
       with:
-        name: firmware_${{ inputs.board }}
+        name: firmware_build_${{ inputs.board }}
         path: .pio/build/${{ inputs.board }}/*.bin
         retention-days: 1
         if-no-files-found: error

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

@@ -0,0 +1,43 @@
+name: build-frontend
+description: Builds the frontend and uploads it as an artifact
+inputs:
+  node-version:
+    description: 'NodeJS runtime version to use'
+    required: true
+  skip-checkout:
+    description: 'If true, skips checkout'
+    default: false
+
+runs:
+  using: composite
+  steps:
+    - uses: actions/checkout@v4
+      if: ${{ !inputs.skip-checkout }}
+      with:
+        sparse-checkout: |
+          frontend
+        path: ${{ github.repository }}
+
+    - uses: actions/setup-node@v4
+      with:
+        node-version: ${{ inputs.node-version }}
+        cache: 'npm'
+        cache-dependency-path: ./frontend/package-lock.json
+
+    - name: Install dependencies
+      working-directory: ./frontend
+      shell: bash
+      run: npm ci
+
+    - name: Build
+      working-directory: ./frontend
+      shell: bash
+      run: npm run build
+
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: frontend
+        path: frontend/build/*
+        retention-days: 1
+        if-no-files-found: error

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

@@ -1,6 +1,5 @@
-
-name: build-filesystem
-description: Builds the filesystem.
+name: build-staticfs
+description: Builds the static filesystem partition and uploads it as an artifact
 inputs:
   python-version:
     description: 'Python version to use'
@@ -27,30 +26,30 @@ runs:
     - uses: actions/setup-python@v4
       with:
         python-version: ${{ inputs.python-version }}
-        cache: "pip"
+        cache: 'pip'
 
     - name: Install dependencies
       shell: bash
       run: pip install -r requirements.txt
 
-    - name: Download built captive portal
-      uses: actions/download-artifact@v3
+    - name: Download built frontend
+      uses: actions/download-artifact@v4
       with:
-        name: captive-portal
-        path: WebUI/build/
+        name: frontend
+        path: frontend/build/
 
-    - name: Build filesystem
+    - name: Build filesystem partition
       shell: bash
       run: pio run --target buildfs -e fs
 
-    - name: Rename filesystem binary
+    - name: Rename partition binary
       shell: bash
-      run: mv .pio/build/fs/littlefs.bin filesystem.bin
+      run: mv .pio/build/fs/littlefs.bin staticfs.bin
 
     - name: Upload internal filesystem artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: filesystem
-        path: filesystem.bin
+        name: firmware_staticfs
+        path: staticfs.bin
         retention-days: 1
         if-no-files-found: error

.github/actions/cdn-bump-version/action.yml

@@ -1,26 +1,22 @@
-name: cnd-upload-firmware
-description: Uploads firmware artifacts to CDN
+name: cdn-bump-version
+description: Uploads version file to CDN
 inputs:
   cf-bucket:
     description: Name of the S3 bucket
     required: true
   version:
-    description: Version to upload
+    description: 'Version of the release'
     required: true
   release-channel:
     description: 'Release channel that describes this upload'
-    required: false
-    default: 'none'
+    required: true
 
 runs:
   using: composite
   steps:
-
     - name: Upload version file
       shell: bash
       run: |
-        mkdir upload
-        cd upload
-        echo "${{ inputs.version }}" >> version-${{ inputs.release-channel }}.txt
-        rclone copy . cdn:${{ inputs.cf-bucket }}/
-
+        mkdir -p upload
+        echo "${{ inputs.version }}" >> upload/version-${{ inputs.release-channel }}.txt
+        rclone copy upload cdn:${{ inputs.cf-bucket }}/

.github/actions/cdn-prepare/action.yml

@@ -1,5 +1,5 @@
-name: cnd-upload
-description: Uploads firmware artifacts to CDN
+name: cdn-prepare
+description: Prepares the CDN for firmware uploads
 inputs:
   cf-account-id:
     description: Cloudflare Account ID

.github/actions/cdn-upload-firmware/action.yml

@@ -0,0 +1,52 @@
+name: cdn-upload-firmware
+description: Uploads firmware partitions and merged binaries to CDN along with SHA256 checksums
+inputs:
+  cf-bucket:
+    description: Name of the S3 bucket
+    required: true
+  fw-version:
+    description: Firmware version
+    required: true
+  board:
+    description: 'Board to upload'
+    required: true
+
+runs:
+  using: composite
+  steps:
+    - name: Download static filesystem partition
+      uses: actions/download-artifact@v4
+      with:
+        name: firmware_staticfs
+        path: .
+
+    - name: Download firmware partitions
+      uses: actions/download-artifact@v4
+      with:
+        name: firmware_build_${{ inputs.board }}
+        path: .
+
+    - name: Download merged firmware binary
+      uses: actions/download-artifact@v4
+      with:
+        name: firmware_merged_${{ inputs.board }}
+        path: .
+
+    - name: Rename firmware binaries
+      shell: bash
+      run: |
+        mv OpenShock_*.bin firmware.bin
+
+    - name: Generate SHA256 checksums
+      shell: bash
+      run: |
+        find . -type f -name '*.bin' -exec md5sum {} \; > hashes.md5.txt
+        find . -type f -name '*.bin' -exec sha256sum {} \; > hashes.sha256.txt
+
+    - name: Upload artifacts to CDN
+      shell: bash
+      run: |
+        mkdir -p upload
+        mv *.bin upload/
+        mv hashes.*.txt upload/
+        rclone copy upload 'cdn:${{ inputs.cf-bucket }}/${{ inputs.fw-version }}/${{ inputs.board }}/'

.github/actions/cdn-upload-version-info/action.yml

@@ -1,11 +1,14 @@
-name: cnd-upload-version-info
-description: Uploads firmware artifacts to CDN
+name: cdn-upload-version-info
+description: Uploads version specific info to CDN
 inputs:
   cf-bucket:
     description: Name of the S3 bucket
     required: true
-  version:
-    description: Version to upload
+  fw-version:
+    description: Firmware version
+    required: true
+  release-channel:
+    description: 'Release channel that describes this upload'
     required: true
   boards:
     description: 'List of boards, separated by newlines'
@@ -22,6 +25,6 @@ runs:
     - name: Upload artifacts to CDN
       shell: bash
       run: |
-        mkdir upload
+        mkdir -p upload
         mv boards.txt upload/
-        rclone copy upload cdn:${{ inputs.cf-bucket }}/${{ inputs.version }}/${{ inputs.board }}/
+        rclone copy upload 'cdn:${{ inputs.cf-bucket }}/${{ inputs.fw-version }}/${{ inputs.board }}/'