From 0419f0fd6134286b0cb90436671875e60948426d Mon Sep 17 00:00:00 2001
From: Caelan <git@caesay.com>
Date: Wed, 2 Oct 2024 16:56:22 -0600
Subject: [PATCH] collapse artifact job into package

---
 .github/workflows/build.yml | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a18d3cbd..44ac4946 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -300,21 +300,12 @@ jobs:
         with:
           name: packages
           path: build/Release/*nupkg
-          
-  organise-artifacts:
-    runs-on: ubuntu-latest
-    needs: [package, test-dotnet]
-    steps:
-      - name: Download
-        uses: actions/download-artifact@v4
-        with:
-          path: bin-core
-          pattern: rust-*
-          merge-multiple: true
-      - name: Rearrange
+      - name: Rearrange Artifacts
         run: |
+          mkdir bin-core
           mkdir bin-nodejs
-          mv bin-core/*.node bin-nodejs/
+          mv bin-target/release/*.node bin-nodejs/
+          mv bin-target/release/* bin-core/
       - name: Upload Core
         uses: actions/upload-artifact@v4
         with:
@@ -325,13 +316,10 @@ jobs:
         with:
           name: bin-nodejs
           path: bin-nodejs/*
-      - uses: geekyeggo/delete-artifact@v5
-        with:
-          name: rust-*
 
   release:
     runs-on: ubuntu-latest
-    needs: [package, test-dotnet, test-rust, organise-artifacts]
+    needs: [package, test-dotnet, test-rust]
     if: github.event_name == 'push' && github.ref == 'refs/heads/master'
     steps:
       - name: Invoke Release Workflow