chore(ci): Bump action versions due to Node.js 16 EoL (#4567)

EdgeTX · Jan 27, 2024 · 7c3e395 · 7c3e395
1 parent 6e37308
commit 7c3e395
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 28 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -73,7 +73,7 @@ jobs:
         - ${{ github.workspace }}:/src
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           # fetch-depth: 0 # https://github.com/actions/checkout#Fetch-all-history-for-all-tags-and-branches
@@ -99,8 +99,7 @@ jobs:
           - t16;t18
           - t8;zorro;pocket;mt12;commando8
           - tlite;tpro;tprov2;lr3pro
-          - t20
-          - t14
+          - t20;t14
           - tx12;tx12mk2;boxer
           - tx16s
           - x10;x10-access
@@ -117,7 +116,7 @@ jobs:
         - ${{ github.workspace }}:/src
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -128,17 +127,30 @@ jobs:
           echo "Running firmware build"
           ./tools/build-gh.sh
 
-      - name: Compose release filename
-        # https://stackoverflow.com/questions/58033366/how-to-get-current-branch-within-github-actions
-        run: echo "artifact_name=edgetx-firmware-${GITHUB_REF##*/}" >> $GITHUB_ENV
-
-      - name: Package firmware ${{ matrix.target }}
-        uses: actions/upload-artifact@v3
+      - name: Upload ${{ matrix.target }}
+        uses: actions/upload-artifact@v4
         with:
-          name: "${{ env.artifact_name }}"
+          name: firmare-${{ matrix.target }}
           path: |
             fw.json
             LICENSE
             *.bin
           retention-days: 15
           if-no-files-found: error
+
+  package:
+    name: Package firmwares
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Compose release filename
+        # https://stackoverflow.com/questions/58033366/how-to-get-current-branch-within-github-actions
+        run: echo "artifact_name=edgetx-firmware-${GITHUB_REF##*/}" >> $GITHUB_ENV
+
+      - name: Merge firmware artifact packages
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: "${{ env.artifact_name }}"
+          pattern: firmare-*
+          delete-merged: true
+          retention-days: 15
diff --git a/.github/workflows/linux_cpn.yml b/.github/workflows/linux_cpn.yml
@@ -35,7 +35,7 @@ jobs:
 
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -51,7 +51,7 @@ jobs:
         run: echo "artifact_name=edgetx-cpn-linux-${GITHUB_REF##*/}" >> $GITHUB_ENV
 
       - name: Archive production artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "${{ env.artifact_name }}"
           path:  ${{github.workspace}}/output

diff --git a/.github/workflows/macosx_cpn.yml b/.github/workflows/macosx_cpn.yml
@@ -41,12 +41,12 @@ jobs:
           xcode-version: '11.7'
 
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
       - name: Setup Python 3.9
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.9'
 
@@ -98,7 +98,7 @@ jobs:
         run: echo "artifact_name=edgetx-cpn-osx-${GITHUB_REF##*/}" >> $GITHUB_ENV
 
       - name: Archive production artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "${{ env.artifact_name }}"
           path:  ${{github.workspace}}/output

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -18,8 +18,7 @@ jobs:
           - nv14;el18
           - pl18;pl18ev
           - t12
-          - t16
-          - t18
+          - t16;t18
           - t8;zorro;pocket;mt12;commando8
           - tlite;tpro;tprov2;lr3pro
           - t20;t14
@@ -32,13 +31,14 @@ jobs:
           - x9e;x9e-hall
           - x9lite;x9lites
           - xlite;xlites
+          - mt12
     container:
       image: ghcr.io/edgetx/edgetx-dev:latest
       volumes:
         - ${{ github.workspace }}:/src
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -49,9 +49,9 @@ jobs:
         run: ./tools/build-gh.sh
 
       - name: Package firmware ${{ matrix.target }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: edgetx-firmware-nightly
+          name: edgetx-firmware-nightly-${{ matrix.target }}
           path: |
             fw.json
             LICENSE
@@ -65,10 +65,10 @@ jobs:
     needs: build
     steps:
       - name: Download artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: edgetx-firmware-nightly
-          path: edgetx-firmware-nightly
+          pattern: edgetx-firmware-nightly-*
+          merge-multiple: true
 
       - name: Compose release filename
         run: echo "release_filename=edgetx-firmware-nightly-${GITHUB_SHA::8}.zip" >> $GITHUB_ENV

diff --git a/.github/workflows/win_cpn-32.yml b/.github/workflows/win_cpn-32.yml
@@ -70,7 +70,7 @@ jobs:
           arch: ${{ env.MINGW_VERSION }}
 
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -86,7 +86,7 @@ jobs:
         run: echo "artifact_name=edgetx-cpn-win32-${GITHUB_REF##*/}" >> $GITHUB_ENV
 
       - name: Archive production artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "${{ env.artifact_name }}"
           path:  ${{github.workspace}}/output

diff --git a/.github/workflows/win_cpn-64.yml b/.github/workflows/win_cpn-64.yml
@@ -78,7 +78,7 @@ jobs:
           arch: ${{ env.MINGW_VERSION }}
 
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -95,7 +95,7 @@ jobs:
         run: echo "artifact_name=edgetx-cpn-win64-${GITHUB_REF##*/}" >> $GITHUB_ENV
 
       - name: Archive production artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "${{ env.artifact_name }}"
           path:  ${{github.workspace}}/output