CI: fix artifact download

tmbasic-lang · Nov 11, 2023 · 80fb25f · 80fb25f
1 parent ba3827d
commit 80fb25f
Showing 1 changed file with 31 additions and 73 deletions.
diff --git a/.github/workflows/tmbasic.yaml b/.github/workflows/tmbasic.yaml
@@ -38,12 +38,13 @@ jobs:
           docker pull "$IMAGE_NAME"
 
           ./${{ matrix.platform }}.sh -c "make runner"
+          mv bin/runner.gz runner-${{ matrix.platform }}.gz
 
       - name: Upload runner.gz
         uses: actions/upload-artifact@v3
         with:
-          name: runner-${{ matrix.platform }}.gz
-          path: bin/runner.gz
+          name: runner-${{ matrix.platform }}
+          path: runner-${{ matrix.platform }}.gz
 
   build-runner-mac:
     # Our build process requires an M1 Mac; it won't work on an Intel Mac.
@@ -77,99 +78,56 @@ jobs:
 
           cd build
           ./${{ matrix.platform }}.sh -c "make runner"
+          mv bin/runner.gz runner-${{ matrix.platform }}.gz
 
       - name: Upload runner.gz
         uses: actions/upload-artifact@v3
         with:
-          name: runner-${{ matrix.platform }}.gz
-          path: bin/runner.gz
+          name: runner-${{ matrix.platform }}
+          path: runner-${{ matrix.platform }}.gz
 
   gather-runners:
     runs-on: ubuntu-latest
     name: Gather Runners
     needs: [build-runner-docker, build-runner-mac]
     steps:
-      - name: Download runner-linux-arm64.gz
+      - name: Download artifacts
         uses: actions/download-artifact@v3
         with:
-          name: runner-linux-arm64.gz
-          path: runner-linux-arm64.gz
-
-      - name: Download runner-linux-arm32.gz
-        uses: actions/download-artifact@v3
-        with:
-          name: runner-linux-arm32.gz
-          path: runner-linux-arm32.gz
-
-      - name: Download runner-linux-x64.gz
-        uses: actions/download-artifact@v3
-        with:
-          name: runner-linux-x64.gz
-          path: runner-linux-x64.gz
-
-      - name: Download runner-linux-x86.gz
-        uses: actions/download-artifact@v3
-        with:
-          name: runner-linux-x86.gz
-          path: runner-linux-x86.gz
-
-      - name: Download runner-win-x64.gz
-        uses: actions/download-artifact@v3
-        with:
-          name: runner-win-x64.gz
-          path: runner-win-x64.gz
-
-      - name: Download runner-win-x86.gz
-        uses: actions/download-artifact@v3
-        with:
-          name: runner-win-x86.gz
-          path: runner-win-x86.gz
-
-      - name: Download runner-mac-arm64.gz
-        uses: actions/download-artifact@v3
-        with:
-          name: runner-mac-arm64.gz
-          path: runner-mac-arm64.gz
-
-      - name: Download runner-mac-x64.gz
-        uses: actions/download-artifact@v3
-        with:
-          name: runner-mac-x64.gz
-          path: runner-mac-x64.gz
+          path: .
 
       - name: Combine
         run: |
           set -euxo pipefail
-          tar cvf runners.tar \
-            runner-linux-arm64.gz \
-            runner-linux-arm32.gz \
-            runner-linux-x64.gz \
-            runner-linux-x86.gz \
-            runner-win-x64.gz \
-            runner-win-x86.gz \
-            runner-mac-arm64.gz \
-            runner-mac-x64.gz \
-            ;
+          mv runner-linux-arm64/*.gz .
+          mv runner-linux-arm32/*.gz .
+          mv runner-linux-x64/*.gz .
+          mv runner-linux-x86/*.gz .
+          mv runner-win-x64/*.gz .
+          mv runner-win-x86/*.gz .
+          mv runner-mac-arm64/*.gz .
+          mv runner-mac-x64/*.gz .
+          tar cvf runners.tar *.gz
 
       - name: Upload runners.tar
         uses: actions/upload-artifact@v3
         with:
-          name: runners.tar
+          name: runners
           path: runners.tar
 
       - name: Delete runner-*.gz
         uses: geekyeggo/delete-artifact@v2
         with:
           useGlob: false
           name: |
-            runner-linux-arm64.gz
-            runner-linux-arm32.gz
-            runner-linux-x64.gz
-            runner-linux-x86.gz
-            runner-win-x64.gz
-            runner-win-x86.gz
-            runner-mac-arm64.gz
-            runner-mac-x64.gz
+            runner-linux-arm64
+            runner-linux-arm32
+            runner-linux-x64
+            runner-linux-x86
+            runner-win-x64
+            runner-win-x86
+            runner-mac-arm64
+            runner-mac-x64
 
   build-tmbasic-docker:
     runs-on: ubuntu-latest
@@ -197,8 +155,8 @@ jobs:
       - name: Download runners.tar
         uses: actions/download-artifact@v3
         with:
-          name: runners.tar
-          path: runners.tar
+          name: runners
+          path: .
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2
@@ -261,8 +219,8 @@ jobs:
       - name: Download runners.tar
         uses: actions/download-artifact@v3
         with:
-          name: runners.tar
-          path: runners.tar
+          name: runners
+          path: .
 
       - name: Build
         env:
@@ -307,4 +265,4 @@ jobs:
         uses: geekyeggo/delete-artifact@v2
         with:
           useGlob: false
-          name: runners.tar
+          name: runners