Merge pull request #210 from OpenShock/develop

Add OpenShock Core v2 support
OpenShock · Mar 5, 2024 · 93c3694 · 93c3694
2 parents 9e7646d + f0eba5e
commit 93c3694
Show file tree

Hide file tree

Showing 18 changed files with 320 additions and 268 deletions.
diff --git a/.github/actions/build-firmware/action.yml b/.github/actions/build-firmware/action.yml
@@ -21,15 +21,15 @@ runs:
     - uses: actions/checkout@v4
       if: ${{ !inputs.skip-checkout }}
 
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       with:
         path: |
           ~/.platformio/platforms
           ~/.platformio/packages
           ~/.platformio/.cache
         key: pio-${{ runner.os }}-${{ hashFiles('platformio.ini', 'requirements.txt') }}
 
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: ${{ inputs.python-version }}
         cache: 'pip'

diff --git a/.github/actions/build-staticfs/action.yml b/.github/actions/build-staticfs/action.yml
@@ -15,15 +15,15 @@ runs:
     - uses: actions/checkout@v4
       if: ${{ !inputs.skip-checkout }}
 
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       with:
         path: |
           ~/.platformio/platforms
           ~/.platformio/packages
           ~/.platformio/.cache
         key: pio-${{ runner.os }}-${{ hashFiles('platformio.ini', 'requirements.txt') }}
 
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: ${{ inputs.python-version }}
         cache: 'pip'

diff --git a/.github/actions/merge-partitions/action.yml b/.github/actions/merge-partitions/action.yml
@@ -4,8 +4,8 @@ inputs:
   python-version:
     description: 'Python version to use'
     required: true
-  release-channel:
-    description: 'Release channel that describes this upload'
+  version:
+    description: 'Version of the firmware'
     required: true
   board:
     description: 'Board name to merge partitions for'
@@ -26,7 +26,7 @@ runs:
           boards
           chips
 
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: ${{ inputs.python-version }}
         cache: 'pip'
@@ -49,7 +49,7 @@ runs:
       shell: bash
       run: |
         python scripts/merge_image.py ${{ inputs.board }}
-        mv merged.bin OpenShock_${{ inputs.board }}_${{ inputs.release-channel }}.bin
+        mv merged.bin OpenShock_${{ inputs.board }}_${{ inputs.version }}.bin
 
     - name: Upload merged firmware binary
       uses: actions/upload-artifact@v4

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -5,21 +5,50 @@
 
 version: 2
 updates:
+  # Daily checks for updates in Github Actions (CI/CD workflows)
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'weekly'
+      day: 'monday'
+      time: '06:00'
+    groups:
+      ci-cd:
+        patterns:
+          - '*' # Group all updates together
+
+  # Daily checks for npm package updates in CI-CD scripts
+  - package-ecosystem: 'npm'
+    directory: '/.github/scripts'
+    schedule:
+      interval: 'weekly'
+      day: 'monday'
+      time: '06:00'
+    groups:
+      ci-cd:
+        patterns:
+          - '*' # Group all updates together
 
-  # Check for Github Actions version updates (for CI/CD)
-  - package-ecosystem: "github-actions"
-    directory: "/"
+  # Daily checks for pip package updates in build system scripts
+  - package-ecosystem: 'pip'
+    directory: '/'
     schedule:
-      interval: "daily"
+      interval: 'weekly'
+      day: 'monday'
+      time: '06:00'
+    groups:
+      build-system:
+        patterns:
+          - '*' # Group all updates together
 
-  # Check for npm updates
+  # Daily checks for npm package updates in frontend
   - package-ecosystem: 'npm'
     directory: '/frontend'
     schedule:
       interval: 'weekly'
       day: 'monday'
       time: '06:00'
     groups:
-      npm-dependencies:
+      frontend:
         patterns:
           - '*' # Group all updates together
diff --git a/.github/scripts/package-lock.json b/.github/scripts/package-lock.json
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -86,7 +86,7 @@ jobs:
       - uses: ./.github/actions/merge-partitions
         with:
           python-version: ${{ env.PYTHON_VERSION }}
-          release-channel: ${{ needs.getvars.outputs.release-channel }}
+          version: ${{ needs.getvars.outputs.version }}
           board: ${{ matrix.board }}
           skip-checkout: true
 

diff --git a/README.md b/README.md
@@ -7,11 +7,26 @@
 [![GitHub Sponsors](https://img.shields.io/badge/GitHub-Sponsors-ff69b4)](https://github.com/sponsors/openshock)
 [![Discord](https://img.shields.io/discord/1078124408775901204)](https://discord.gg/openshock)
 
-|         |                                                                                                                                                                                        |                                                                                                                                                                                     |                                                                                                                                                                    |
-|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Master  | [![Build Status](https://github.com/OpenShock/Firmware/actions/workflows/ci-build.yml/badge.svg?branch=master)](https://github.com/OpenShock/Firmware/actions/workflows/ci-build.yml)  | [![CodeQL Status](https://github.com/OpenShock/Firmware/actions/workflows/codeql.yml/badge.svg?branch=master)](https://github.com/OpenShock/Firmware/actions/workflows/codeql.yml)  | [![Coverage Status](https://coveralls.io/repos/github/openshock/firmware/badge.svg?branch=master)](https://coveralls.io/github/openshock/firmware?branch=master)   |
-| Beta    | [![Build Status](https://github.com/OpenShock/Firmware/actions/workflows/ci-build.yml/badge.svg?branch=beta)](https://github.com/OpenShock/Firmware/actions/workflows/ci-build.yml)    | [![CodeQL Status](https://github.com/OpenShock/Firmware/actions/workflows/codeql.yml/badge.svg?branch=beta)](https://github.com/OpenShock/Firmware/actions/workflows/codeql.yml)    | [![Coverage Status](https://coveralls.io/repos/github/openshock/firmware/badge.svg?branch=beta)](https://coveralls.io/github/openshock/firmware?branch=beta)       |
-| Develop | [![Build Status](https://github.com/OpenShock/Firmware/actions/workflows/ci-build.yml/badge.svg?branch=develop)](https://github.com/OpenShock/Firmware/actions/workflows/ci-build.yml) | [![CodeQL Status](https://github.com/OpenShock/Firmware/actions/workflows/codeql.yml/badge.svg?branch=develop)](https://github.com/OpenShock/Firmware/actions/workflows/codeql.yml) | [![Coverage Status](https://coveralls.io/repos/github/openshock/firmware/badge.svg?branch=develop)](https://coveralls.io/github/openshock/firmware?branch=develop) |
+<table>
+  <tr>
+    <td>master</td>
+    <td><a href="https://github.com/OpenShock/Firmware/actions/workflows/ci-build.yml"><img src="https://github.com/OpenShock/Firmware/actions/workflows/ci-build.yml/badge.svg?branch=master" alt="Build Status" /></a></td>
+    <td><a href="https://github.com/OpenShock/Firmware/actions/workflows/codeql.yml"><img src="https://github.com/OpenShock/Firmware/actions/workflows/codeql.yml/badge.svg?branch=master" alt="CodeQL Status" /></a></td>
+    <td><a href="https://coveralls.io/github/openshock/firmware?branch=master"><img src="https://coveralls.io/repos/github/openshock/firmware/badge.svg?branch=master" alt="Coverage Status" /></a></td>
+  </tr>
+  <tr>
+    <td>beta</td>
+    <td><a href="https://github.com/OpenShock/Firmware/actions/workflows/ci-build.yml"><img src="https://github.com/OpenShock/Firmware/actions/workflows/ci-build.yml/badge.svg?branch=beta" alt="Build Status" /></a></td>
+    <td><a href="https://github.com/OpenShock/Firmware/actions/workflows/codeql.yml"><img src="https://github.com/OpenShock/Firmware/actions/workflows/codeql.yml/badge.svg?branch=beta" alt="CodeQL Status" /></a></td>
+    <td><a href="https://coveralls.io/github/openshock/firmware?branch=master"><img src="https://coveralls.io/repos/github/openshock/firmware/badge.svg?branch=beta" alt="Coverage Status" /></a></td>
+  </tr>
+  <tr>
+    <td>develop</td>
+    <td><a href="https://github.com/OpenShock/Firmware/actions/workflows/ci-build.yml"><img src="https://github.com/OpenShock/Firmware/actions/workflows/ci-build.yml/badge.svg?branch=develop" alt="Build Status" /></a></td>
+    <td><a href="https://github.com/OpenShock/Firmware/actions/workflows/codeql.yml"><img src="https://github.com/OpenShock/Firmware/actions/workflows/codeql.yml/badge.svg?branch=develop" alt="CodeQL Status" /></a></td>
+    <td><a href="https://coveralls.io/github/openshock/firmware?branch=master"><img src="https://coveralls.io/repos/github/openshock/firmware/badge.svg?branch=develop" alt="Coverage Status" /></a></td>
+  </tr>
+</table>
 
 Espressif Firmware for OpenShock.