👷 Artifacts download fix experiment

ThrowTheSwitch · Jan 24, 2025 · b5e5028 · b5e5028
1 parent 5d2214d
commit b5e5028
Showing 1 changed file with 57 additions and 2 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -86,6 +86,15 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
+      # Upload the generated files as artifacts 
+      - uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.IMAGE_NAME }}
+          path: |
+            ${{ env.IMAGE_DIR }}/docker/Dockerfile
+            ${{ env.IMAGE_DIR }}/assets/shell/welcome
+          if-no-files-found: error
+
   madsciencelab-plugins:
     runs-on: ubuntu-latest
     needs: [image-details]
@@ -145,6 +154,15 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
+      # Upload the generated files as artifacts 
+      - uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.IMAGE_NAME }}
+          path: |
+            ${{ env.IMAGE_DIR }}/docker/Dockerfile
+            ${{ env.IMAGE_DIR }}/assets/shell/welcome
+          if-no-files-found: error
+
   madsciencelab-arm-none-eabi:
     runs-on: ubuntu-latest
     needs: [image-details]
@@ -204,6 +222,15 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
+      # Upload the generated files as artifacts 
+      - uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.IMAGE_NAME }}
+          path: |
+            ${{ env.IMAGE_DIR }}/docker/Dockerfile
+            ${{ env.IMAGE_DIR }}/assets/shell/welcome
+          if-no-files-found: error
+
   madsciencelab-arm-none-eabi-plugins:
     runs-on: ubuntu-latest
     needs: [image-details]
@@ -263,18 +290,46 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
+      # Upload the generated files as artifacts 
+      - uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.IMAGE_NAME }}
+          path: |
+            ${{ env.IMAGE_DIR }}/docker/Dockerfile
+            ${{ env.IMAGE_DIR }}/assets/shell/welcome
+          if-no-files-found: error
+
   artifacts-release:
     runs-on: ubuntu-latest
-    needs: [madsciencelab, madsciencelab-plugins, madsciencelab-arm-none-eabi, madsciencelab-arm-none-eabi-plugins]
+    needs:
+      - madsciencelab
+      - madsciencelab-plugins
+      - madsciencelab-arm-none-eabi
+      - madsciencelab-arm-none-eabi-plugins
     permissions:
       contents: write
 
     steps:
+      # Get the repo so we have info for generating release details
+      - name: 'Checkout GitHub Action'
+        uses: actions/checkout@v4
+
+      # Download all artifacts from the 4 Docker image builds
+      - uses: actions/download-artifact@v4
+        with:
+          path: artifacts
+
+      # Capture the SHA string
+      - name: 'Git commit short SHA as environment variable'
+        shell: bash
+        run: |
+          echo "SHA_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+
       - uses: ncipollo/release-action@v1
         with:
           # Defaults to using tag name.
           # This workflow is only triggered by tags.
           prerelease: false
           allowUpdates: true
-          artifacts: "build/*/docker/Dockerfile,build/*/assets/shell/welcome"
+          artifacts: "artifacts/**/Dockerfile,artifacts/**/welcome"