updated workflows to get rpi5 integrated.

jens-maus · Nov 20, 2023 · 1283c32 · 1283c32
1 parent b916944
commit 1283c32
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -104,7 +104,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [rpi0, rpi2, rpi3, rpi4, tinkerboard, odroid-c2, odroid-c4, odroid-n2, intelnuc, ova, oci_amd64, oci_arm64, oci_arm]
+        platform: [rpi0, rpi2, rpi3, rpi4, rpi5, tinkerboard, odroid-c2, odroid-c4, odroid-n2, intelnuc, ova, oci_amd64, oci_arm64, oci_arm]
 
     steps:
       - name: Checkout Code

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -111,7 +111,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [rpi0, rpi2, rpi3, rpi4, tinkerboard, odroid-c2, odroid-c4, odroid-n2, intelnuc, ova, oci_amd64, oci_arm64, oci_arm]
+        platform: [rpi0, rpi2, rpi3, rpi4, rpi5, tinkerboard, odroid-c2, odroid-c4, odroid-n2, intelnuc, ova, oci_amd64, oci_arm64, oci_arm]
 
     steps:
       - name: Checkout Code
@@ -441,14 +441,20 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           name: RaspberryMatic-${{ needs.release_draft.outputs.version }}-rpi4.mf
+      - name: Download rpi5 manifest
+        uses: actions/download-artifact@v3
+        with:
+          name: RaspberryMatic-${{ needs.release_draft.outputs.version }}-rpi5.mf
+
 
       - name: Bump rpi-imager version
         run: |
           release/rpi-imager-update.sh release/rpi-imager.json \
             RaspberryMatic-${{ needs.release_draft.outputs.version }}-rpi0.mf \
             RaspberryMatic-${{ needs.release_draft.outputs.version }}-rpi2.mf \
             RaspberryMatic-${{ needs.release_draft.outputs.version }}-rpi3.mf \
-            RaspberryMatic-${{ needs.release_draft.outputs.version }}-rpi4.mf
+            RaspberryMatic-${{ needs.release_draft.outputs.version }}-rpi4.mf \
+            RaspberryMatic-${{ needs.release_draft.outputs.version }}-rpi5.mf
 
       - name: Bump LATEST-VERSION.js
         run: |

diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
@@ -12,6 +12,11 @@ on:
         description: 'Skip build (for testing workflow)?'
         required: true
         default: "false"
+      platforms:
+        description: 'List of platforms to build (comma seperated)'
+        required: false
+        default: ""
+        type: string
 
 # default read-only permission
 permissions:
@@ -43,7 +48,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [rpi0, rpi2, rpi3, rpi4, tinkerboard, odroid-c2, odroid-c4, odroid-n2, intelnuc, ova, oci_amd64, oci_arm64, oci_arm]
+        platform: ${{ fromJSON(format('[{0}]', github.event.inputs.platforms || '"rpi0","rpi2","rpi3","rpi4","rpi5","tinkerboard","odroid-c2","odroid-c4","odroid-n2","intelnuc","ova","oci_amd64",oci_arm64","oci_arm"')) }}
 
     steps:
       - name: Checkout Code
@@ -418,14 +423,19 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           name: RaspberryMatic-${{ env.BUILD_VERSION }}-${{ env.GITHUB_SHA7 }}-rpi4.mf
+      - name: Download rpi5 manifest
+        uses: actions/download-artifact@v3
+        with:
+          name: RaspberryMatic-${{ env.BUILD_VERSION }}-${{ env.GITHUB_SHA7 }}-rpi5.mf
 
       - name: Bump rpi-imager version
         run: |
           release/rpi-imager-update.sh release/rpi-imager-dev.json \
             RaspberryMatic-${{ env.BUILD_VERSION }}-${{ env.GITHUB_SHA7 }}-rpi0.mf \
             RaspberryMatic-${{ env.BUILD_VERSION }}-${{ env.GITHUB_SHA7 }}-rpi2.mf \
             RaspberryMatic-${{ env.BUILD_VERSION }}-${{ env.GITHUB_SHA7 }}-rpi3.mf \
-            RaspberryMatic-${{ env.BUILD_VERSION }}-${{ env.GITHUB_SHA7 }}-rpi4.mf
+            RaspberryMatic-${{ env.BUILD_VERSION }}-${{ env.GITHUB_SHA7 }}-rpi4.mf \
+            RaspberryMatic-${{ env.BUILD_VERSION }}-${{ env.GITHUB_SHA7 }}-rpi5.mf
 
       - name: Commit changes
         run: |

diff --git a/release/rpi-imager-dev.json b/release/rpi-imager-dev.json
@@ -1,5 +1,20 @@
 {
   "os_list": [
+    {
+      "name": "RaspberryMatic 3.73.9.20231119-fe2ab7 (Pi 5)",
+      "description": "Lightweight Linux OS for running a HomeMatic/homematicIP IoT central.",
+      "url": "https://github.com/jens-maus/RaspberryMatic/releases/download/snapshots/RaspberryMatic-3.73.9.20231119-fe2ab7-rpi5.zip",
+      "icon": "https://raw.githubusercontent.com/jens-maus/RaspberryMatic/master/release/rpi-imager-dev.png",
+      "release_date": "2023-11-19",
+      "extract_size": 1345249792,
+      "extract_sha256": "e04a7cb33fb91ee9413419307fd68773b862cae6f3f16b3f15ccba1c76836455",
+      "image_download_size": 315765127,
+      "image_download_sha256": "7cfe4507bba4f0d6e11c180e21f65e81c041ca3288b138f696185e6438b35aa9",
+      "website": "https://github.com/jens-maus/RaspberryMatic/releases/tag/snapshots",
+      "devices": [
+        "pi5-64bit"
+      ]
+    },
     {
       "name": "RaspberryMatic 3.73.9.20231119-fe2ab7 (Pi 4, Pi 400)",
       "description": "Lightweight Linux OS for running a HomeMatic/homematicIP IoT central.",

diff --git a/release/rpi-imager-update.sh b/release/rpi-imager-update.sh
@@ -59,6 +59,7 @@ RPI0_MF=$(readlink -f "${2}")
 RPI2_MF=$(readlink -f "${3}")
 RPI3_MF=$(readlink -f "${4}")
 RPI4_MF=$(readlink -f "${5}")
+RPI5_MF=$(readlink -f "${6}")
 
 # extract version and release date from first mf filename
 # shellcheck disable=SC2001
@@ -108,9 +109,10 @@ function updateJSON() {
 cp -a "${RPI_IMAGER_PATH}" "${TEMP_DIR}/rpi-imager.json"
 
 # update rpi-imager.json
-updateJSON 0 rpi4 "${RPI4_MF}" "Pi 4, Pi 400"
-updateJSON 1 rpi3 "${RPI3_MF}" "Pi 3, Pi Zero 2, ELV-Charly, CCU3"
-updateJSON 2 rpi2 "${RPI2_MF}" "Pi 2"
-updateJSON 3 rpi0 "${RPI0_MF}" "Pi Zero, Pi 1"
+updateJSON 0 rpi5 "${RPI5_MF}" "Pi 5"
+updateJSON 1 rpi4 "${RPI4_MF}" "Pi 4, Pi 400"
+updateJSON 2 rpi3 "${RPI3_MF}" "Pi 3, Pi Zero 2, ELV-Charly, CCU3"
+updateJSON 3 rpi2 "${RPI2_MF}" "Pi 2"
+updateJSON 4 rpi0 "${RPI0_MF}" "Pi Zero, Pi 1"
 
 cp -a "${TEMP_DIR}/rpi-imager.json" "${RPI_IMAGER_PATH}"
diff --git a/release/rpi-imager.json b/release/rpi-imager.json
@@ -1,5 +1,18 @@
 {
   "os_list": [
+    {
+      "name": "RaspberryMatic 3.71.12.20231020 (Pi 5)",
+      "description": "Lightweight Linux OS for running a HomeMatic/homematicIP IoT central.",
+      "url": "https://github.com/jens-maus/RaspberryMatic/releases/download/3.71.12.20231020/RaspberryMatic-3.71.12.20231020-rpi5.zip",
+      "icon": "https://raw.githubusercontent.com/jens-maus/RaspberryMatic/master/release/rpi-imager.png",
+      "release_date": "2023-10-20",
+      "extract_size": 1345249792,
+      "extract_sha256": "ad02b397fd81df21f695209f9e66deab40538589832302597cffd62e41488a28",
+      "image_download_size": 321138334,
+      "image_download_sha256": "3f0dad5bfe927bbaef4714839c3d6ce4fb33d6c6df9ac93b584fc139c3021610",
+      "website": "https://raspberrymatic.de/",
+      "devices": ["pi5-64bit"]
+    },
     {
       "name": "RaspberryMatic 3.71.12.20231020 (Pi 4, Pi 400)",
       "description": "Lightweight Linux OS for running a HomeMatic/homematicIP IoT central.",