refactor: fix artifacts not uploaded issue

Signed-off-by: seven <[email protected]>
geek-fun · Jun 29, 2024 · c4f67d4 · c4f67d4
1 parent 78aa1f5
commit c4f67d4
Showing 1 changed file with 17 additions and 12 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -136,7 +136,11 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: artifacts-${{ matrix.os }}
-          path: ~/src-tauri/target/**/*.{dmg,rpm,deb,exe}
+          path: |
+            ${{ github.workspace }}/src-tauri/target/universal-apple-darwin/release/bundle/dmg/*.dmg
+            ${{ github.workspace }}/src-tauri/target/${{ matrix.target }}/release/bundle/deb/*.deb
+            ${{ github.workspace }}/src-tauri/target/${{ matrix.target }}/release/bundle/appimage/*.AppImage
+            ${{ github.workspace }}\src-tauri\target\${{ matrix.target }}\release\bundle\nsis\*.exe
 
   release:
     needs: pre-release
@@ -147,7 +151,7 @@ jobs:
       - name: Download Distribution Artifacts
         uses: actions/download-artifact@v4
         with:
-          path: src-tauri/target
+          path: artifacts
           merge-multiple: true
       - name: Generate changelog
         uses: jaywcjlove/changelog-generator@main
@@ -173,14 +177,15 @@ jobs:
             ${{ steps.changelog.outputs.compareurl }}
 
             ${{ steps.changelog.outputs.changelog }}
-          files: ~/src-tauri/target/**/*
-#      - name: Distribute artifacts to R2
-#        uses: ryand56/r2-upload-action@master
+          files: ${{ github.workspace }}/artifacts/**/*
+
+      - name: Distribute artifacts to R2
+        uses: ryand56/r2-upload-action@master
 #        if: steps.tag_release.outputs.successful
-#        with:
-#          r2-account-id:  ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-#          r2-access-key-id: ${{ secrets.CLOUDFLARE_R2_ACCESS_KEY_ID }}
-#          r2-secret-access-key: ${{ secrets.CLOUDFLARE_R2_SECRET_ACCESS_KEY }}
-#          r2-bucket: ${{ secrets.CLOUDFLARE_ARTIFACTS_R2 }}
-#          source-dir: src-tauri/target/**/*
-#          destination-dir: dockit
+        with:
+          r2-account-id:  ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          r2-access-key-id: ${{ secrets.CLOUDFLARE_R2_ACCESS_KEY_ID }}
+          r2-secret-access-key: ${{ secrets.CLOUDFLARE_R2_SECRET_ACCESS_KEY }}
+          r2-bucket: ${{ secrets.CLOUDFLARE_ARTIFACTS_R2 }}
+          source-dir: ${{ github.workspace }}/artifacts/**/*
+          destination-dir: dockit