fix: 构建产物上传重命名，批量下载

idootop · Mar 19, 2024 · 5929f1b · 5929f1b
1 parent 4f34607
commit 5929f1b
Showing 1 changed file with 18 additions and 27 deletions.
diff --git a/.github/workflows/desktop.yaml b/.github/workflows/desktop.yaml
@@ -108,7 +108,7 @@ jobs:
       - name: 上传构建产物
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.build }}
+          name: app_${{ matrix.build }}_${{ matrix.arch }}
           path: |
             packages/feiyu-desktop/src-tauri/target/${{ matrix.target }}/release/bundle/dmg/*.dmg
           if-no-files-found: error
@@ -190,7 +190,7 @@ jobs:
       - name: 上传构建产物
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.build }}
+          name: app_${{ matrix.build }}_${{ matrix.arch }}
           path: |
             packages/feiyu-desktop/src-tauri/target/${{ matrix.target }}/release/bundle/msi/*.msi
             packages/feiyu-desktop/src-tauri/target/${{ matrix.target }}/release/bundle/nsis/*.exe
@@ -208,18 +208,18 @@ jobs:
             build: linux
             os: ubuntu-latest
             arch: x86_64
-          - target: aarch64-unknown-linux-gnu
-            build: linux
-            os: ubuntu-latest
-            arch: aarch64
-          - target: i686-unknown-linux-gnu
-            build: linux
-            os: ubuntu-latest
-            arch: i686
-          - target: armv7-unknown-linux-gnueabihf
-            build: linux
-            os: ubuntu-latest
-            arch: armv7
+          # - target: aarch64-unknown-linux-gnu
+          #   build: linux
+          #   os: ubuntu-latest
+          #   arch: aarch64
+          # - target: i686-unknown-linux-gnu
+          #   build: linux
+          #   os: ubuntu-latest
+          #   arch: i686
+          # - target: armv7-unknown-linux-gnueabihf
+          #   build: linux
+          #   os: ubuntu-latest
+          #   arch: armv7
 
     runs-on: ${{ matrix.os }}
     steps:
@@ -281,7 +281,7 @@ jobs:
       - name: 上传构建产物
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.build }}
+          name: app_${{ matrix.build }}_${{ matrix.arch }}
           path: |
             packages/feiyu-desktop/src-tauri/target/${{ matrix.target }}/release/bundle/deb/*.deb
             packages/feiyu-desktop/src-tauri/target/${{ matrix.target }}/release/bundle/rpm/*.rpm
@@ -298,21 +298,12 @@ jobs:
         id: app
         run: |
           echo "version=$(node -p "require('./packages/feiyu-desktop/src-tauri/tauri.conf.json').version")" >> $GITHUB_OUTPUT
-      - name: 下载构建产物(macOS)
-        uses: actions/download-artifact@v4
-        with:
-          name: macos
-          path: dist
-      - name: 下载构建产物(Windows)
-        uses: actions/download-artifact@v4
-        with:
-          name: windows
-          path: dist
-      - name: 下载构建产物(Linux)
+      - name: 下载构建产物
         uses: actions/download-artifact@v4
         with:
-          name: linux
+          name: app_*
           path: dist
+          merge-multiple: true
       - name: 创建发布版本
         uses: ncipollo/release-action@v1
         with: