Merge branch 'develop'

cars10 · Apr 24, 2024 · 4aaced2 · 4aaced2
2 parents 483b32e + a716a35
commit 4aaced2
Showing 1 changed file with 19 additions and 7 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -29,6 +29,9 @@ jobs:
 
       - uses: actions/checkout@v4
 
+      - uses: martinbeentjes/npm-get-version-action@v1.3.1
+        id: package-version
+
       - uses: actions/setup-node@v4
         with:
           node-version: '20'
@@ -57,8 +60,8 @@ jobs:
       - name: mac aaarch64 > rename artifacts
         if: matrix.platform == 'macos-latest'
         run: |
-          mv src-tauri/target/aarch64-apple-darwin/release/bundle/macos/elasticvue.app.tar.gz src-tauri/target/aarch64-apple-darwin/release/bundle/macos/elasticvue_aarch64.app.tar.gz
-          mv src-tauri/target/aarch64-apple-darwin/release/bundle/macos/elasticvue.app.tar.gz.sig src-tauri/target/aarch64-apple-darwin/release/bundle/macos/elasticvue_aarch64.app.tar.gz.sig
+          mv src-tauri/target/aarch64-apple-darwin/release/bundle/macos/elasticvue.app.tar.gz src-tauri/target/aarch64-apple-darwin/release/bundle/macos/elasticvue_${{ steps.package-version.outputs.current-version }}_aarch64.app.tar.gz
+          mv src-tauri/target/aarch64-apple-darwin/release/bundle/macos/elasticvue.app.tar.gz.sig src-tauri/target/aarch64-apple-darwin/release/bundle/macos/elasticvue_${{ steps.package-version.outputs.current-version }}_aarch64.app.tar.gz.sig
 
       - name: mac aaarch64 > upload artifacts
         if: matrix.platform == 'macos-latest'
@@ -68,7 +71,7 @@ jobs:
           if-no-files-found: error
           path: |
             src-tauri/target/aarch64-apple-darwin/release/bundle/dmg/elasticvue_*_aarch64.dmg
-            src-tauri/target/aarch64-apple-darwin/release/bundle/macos/elasticvue_aarch64*
+            src-tauri/target/aarch64-apple-darwin/release/bundle/macos/elasticvue_*_aarch64*
 
       ### build apple x86_64
 
@@ -79,8 +82,8 @@ jobs:
       - name: mac x86_64 > rename artifacts
         if: matrix.platform == 'macos-latest'
         run: |
-          mv src-tauri/target/x86_64-apple-darwin/release/bundle/macos/elasticvue.app.tar.gz src-tauri/target/x86_64-apple-darwin/release/bundle/macos/elasticvue_x64.app.tar.gz
-          mv src-tauri/target/x86_64-apple-darwin/release/bundle/macos/elasticvue.app.tar.gz.sig src-tauri/target/x86_64-apple-darwin/release/bundle/macos/elasticvue_x64.app.tar.gz.sig
+          mv src-tauri/target/x86_64-apple-darwin/release/bundle/macos/elasticvue.app.tar.gz src-tauri/target/x86_64-apple-darwin/release/bundle/macos/elasticvue_${{ steps.package-version.outputs.current-version }}_x64.app.tar.gz
+          mv src-tauri/target/x86_64-apple-darwin/release/bundle/macos/elasticvue.app.tar.gz.sig src-tauri/target/x86_64-apple-darwin/release/bundle/macos/elasticvue_${{ steps.package-version.outputs.current-version }}_x64.app.tar.gz.sig
 
       - name: mac x86_64 > upload artifacts
         if: matrix.platform == 'macos-latest'
@@ -90,7 +93,7 @@ jobs:
           if-no-files-found: error
           path: |
             src-tauri/target/x86_64-apple-darwin/release/bundle/dmg/elasticvue_*_x64.dmg
-            src-tauri/target/x86_64-apple-darwin/release/bundle/macos/elasticvue_x64*
+            src-tauri/target/x86_64-apple-darwin/release/bundle/macos/elasticvue_*_x64*
 
       ### build linux
 
@@ -179,7 +182,16 @@ jobs:
           prerelease: false
           tag: ${{ github.ref_name }}
           name: ${{ github.ref_name }}
-          artifacts: github-artifacts/**/*
+          artifacts: |
+            github-artifacts/linux_artifacts/bundle/appimage/elasticvue_*_amd64.*
+            github-artifacts/linux_artifacts/bundle/deb/elasticvue_*_amd64.deb
+            github-artifacts/linux_artifacts/elasticvue
+            github-artifacts/mac_aaarch64_artifacts/dmg/elasticvue_*_aarch64.dmg
+            github-artifacts/mac_aaarch64_artifacts/macos/elasticvue_*_aarch64*
+            github-artifacts/mac_x86_64_artifacts/dmg/elasticvue_*_x64.dmg
+            github-artifacts/mac_x86_64_artifacts/macos/elasticvue_*_x64*
+            github-artifacts/windows_artifacts/bundle/msi/elasticvue_*_x64*
+            github-artifacts/windows_artifacts/elasticvue.exe
           body: |
             ## Using elasticvue
             ### Desktop app