CI: update builds.yml to use latest versions for upload-artifact an…

…d `checkout`. Annoyingly, the new `upload-artifact` requires a new step to merge the outputs in a single package.
dss-extensions · Jul 11, 2024 · f1cf225 · f1cf225
1 parent 2d9301d
commit f1cf225
Showing 1 changed file with 23 additions and 13 deletions.
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
@@ -34,10 +34,10 @@ jobs:
           ./build/build_linux_x64.sh
           ls -lR lib
       - name: 'Upload artifacts'
-        uses: "actions/upload-artifact@v3"
+        uses: "actions/upload-artifact@v4"
         #if: github.event_name == 'release' && github.event.action == 'created'
         with:
-          name: 'development-build'
+          name: 'development-build-linux_x64'
           path: '${{ github.workspace }}/dss_capi/release/*.tar.gz'
 
   build_linux_x86:
@@ -68,17 +68,17 @@ jobs:
           docker run -e DSS_CAPI_VERSION -v "${PWD}/..:/build" $DOCKER_IMAGE bash -c 'cd /build/dss_capi; PATH=/opt/python/cp38-cp38/bin/:$PATH bash build/build_linux_x86.sh'
           ls -lR lib
       - name: 'Upload artifacts'
-        uses: "actions/upload-artifact@v3"
+        uses: "actions/upload-artifact@v4"
         #if: github.event_name == 'release' && github.event.action == 'created'
         with:
-          name: 'development-build'
+          name: 'development-build-linux_x86'
           path: '${{ github.workspace }}/dss_capi/release/*.tar.gz'
 
   build_macos_x64:
     name: 'macOS x64 and ARM64'
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: "actions/checkout@v4"
         with: 
           fetch-depth: 0
           path: 'dss_capi'
@@ -109,10 +109,10 @@ jobs:
           ./build/build_macos_arm64.sh
           ls -lR lib
       - name: 'Upload artifacts'
-        uses: "actions/upload-artifact@v3"
+        uses: "actions/upload-artifact@v4"
         #if: github.event_name == 'release' && github.event.action == 'created'
         with:
-          name: 'development-build'
+          name: 'development-build-darwin'
           path: '${{ github.workspace }}/dss_capi/release/*.tar.gz'
 
   build_win_x64:
@@ -121,7 +121,7 @@ jobs:
     env: 
       DSS_CAPI_BUILD_ODDIE: '1'
     steps:
-      - uses: actions/checkout@v3
+      - uses: "actions/checkout@v4"
         with: 
           fetch-depth: 0
           path: 'dss_capi'
@@ -151,17 +151,17 @@ jobs:
           call build/generated/set_version.bat
           call build/build_win_x64.bat
       - name: 'Upload artifacts'
-        uses: "actions/upload-artifact@v3"
+        uses: "actions/upload-artifact@v4"
         #if: github.event_name == 'release' && github.event.action == 'created'
         with:
-          name: 'development-build'
+          name: 'development-build-win_x64'
           path: '${{ github.workspace }}/dss_capi/release/*.zip'
 
   build_win:
     name: 'Windows x86'
     runs-on: windows-2019
     steps:
-      - uses: actions/checkout@v3
+      - uses: "actions/checkout@v4"
         with: 
           fetch-depth: 0
           path: 'dss_capi'
@@ -189,8 +189,18 @@ jobs:
           call build/generated/set_version.bat
           call build/build_win_x86.bat
       - name: 'Upload artifacts'
-        uses: "actions/upload-artifact@v3"
+        uses: "actions/upload-artifact@v4"
         #if: github.event_name == 'release' && github.event.action == 'created'
         with:
-          name: 'development-build'
+          name: 'development-build-win_x86'
           path: '${{ github.workspace }}/dss_capi/release/*.zip'
+
+  merge:
+    runs-on: ubuntu-latest
+    needs: [build_linux_x64, build_linux_x86, build_macos_x64, build_win_x64, build_win]
+    steps:
+      - name: Merge Artifacts
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: development-build
+          pattern: development-build-*