[WIP] Clean up GH Actions artifact creation

brioche-dev · Dec 30, 2023 · 6516041 · 6516041
1 parent ae419df
commit 6516041
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -43,7 +43,7 @@ jobs:
             --target x86_64-unknown-linux-musl \
             --component rust-src
       - name: Build Brioche
-        run: cargo build --release
+        run: cargo build --release --target=x86_64-unknown-linux-gcc
       - name: Build brioche-pack
         run: |
           cargo +"$NIGHTLY_TOOLCHAIN" build \
@@ -52,17 +52,22 @@ jobs:
             --target=x86_64-unknown-linux-musl \
             -Z 'build-std=std,panic_abort' \
             -Z 'build-std-features=panic_immediate_abort'
+      - name: Prepare artifact
+        run: |
+          mkdir -p artifacts/brioche/x86_64-linux/
+          cp \
+            target/x86_64-unknown-linux-gcc/release/brioche \
+            target/x86_64-unknown-linux-musl/release-tiny/brioche-ld \
+            target/x86_64-unknown-linux-musl/release-tiny/brioche-packed-exec \
+            target/x86_64-unknown-linux-musl/release-tiny/brioche-packed-userland-exec \
+            target/x86_64-unknown-linux-musl/release-tiny/brioche-packer \
+            artifacts/brioche/x86_64-linux/
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
           name: brioche
           if-no-files-found: error
-          path: |
-            target/release/brioche
-            target/x86_64-unknown-linux-musl/release-tiny/brioche-ld
-            target/x86_64-unknown-linux-musl/release-tiny/brioche-packed-exec
-            target/x86_64-unknown-linux-musl/release-tiny/brioche-packed-userland-exec
-            target/x86_64-unknown-linux-musl/release-tiny/brioche-packer
+          path: artifacts/brioche
   push:
     name: Push artifacts
     if: github.ref == 'refs/heads/cicd' && github.repository == 'brioche-dev/brioche'