Correct contents of artifact

stumpapp · Jul 19, 2024 · 66d8ef1 · 66d8ef1
1 parent 5574d76
commit 66d8ef1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/.github/actions/build-server/action.yml b/.github/actions/build-server/action.yml
@@ -10,12 +10,6 @@ runs:
     - name: Setup rust
       uses: ./.github/actions/setup-rust
 
-    - name: Copy bundled web app
-      uses: actions/download-artifact@v4
-      with:
-        name: webapp
-        path: ./apps/server/dist
-
     # This action can be called to build in a Linux or Windows runner
     # This step only runs when using Linux
     - name: Compile server (Linux)

diff --git a/.github/workflows/release_binary.yml b/.github/workflows/release_binary.yml
@@ -43,11 +43,20 @@ jobs:
       - name: Build stump server
         uses: ./.github/actions/build-server
 
+      - name: Copy bundled web app
+        uses: actions/download-artifact@v4
+        with:
+          name: webapp
+          path: ./staging/client
+
+      - name: Prepare artifact
+        run: mv target/release/${{ matrix.artifact_filename }} ./staging/${{ matrix.artifact_filename }}
+
       - name: Upload server artifact
         uses: ./.github/actions/upload-artifact
         with:
           upload-name: ${{ matrix.artifact_name }}
-          upload-path: target/release/${{ matrix.artifact_filename }}
+          upload-path: staging
   # This job creates the release and organizes associated files
   create-release:
     needs: build-binary