diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 31e9650..1b85498 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -88,6 +88,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] @@ -146,6 +155,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] @@ -262,15 +289,35 @@ 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-prerelease: 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 + # Capture the SHA string - - name: Git commit short SHA as environment variable + - name: 'Git commit short SHA as environment variable' shell: bash run: | echo "SHA_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_ENV @@ -282,5 +329,5 @@ jobs: commit: ${{ github.sha }} tag: ${{ env.SHA_SHORT }} name: Prerelease-${{ env.SHA_SHORT }} - artifacts: "build/*/docker/Dockerfile,build/*/assets/shell/welcome" + artifacts: "**/Dockerfile,**/welcome"