Merge branch 'master' of github.com:logseq/logseq

dingguijin · Feb 3, 2021 · e9e524f · e9e524f
2 parents b3ddcae + 06dee78
commit e9e524f
Showing 1 changed file with 31 additions and 8 deletions.
diff --git a/.github/workflows/build-desktop-release.yml b/.github/workflows/build-desktop-release.yml
@@ -200,26 +200,38 @@ jobs:
         run: yarn install --frozen-lockfile && yarn electron:make
         working-directory: ./static
 
-      - name: Change Artifact Name
-        run: mv static/out/make/Logseq.dmg static/out/make/Logseq-x64.dmg
+      - name: Change DMG Name
+        run: mv static/out/make/Logseq.dmg static/out/make/logseq-darwin-x64-${{ github.event.inputs.tag-version }}.dmg
 
-      - name: Cache Artifact
+      - name: Cache Artifact DMG
         uses: actions/upload-artifact@v1
         with:
           name: Logseq-x64.dmg
-          path: static/out/make/Logseq-x64.dmg
+          path: static/out/make/logseq-darwin-x64-${{ github.event.inputs.tag-version }}.dmg
+
+      - name: Cache Artifact ZIP
+        uses: actions/upload-artifact@v1
+        with:
+          name: Logseq-x64.zip
+          path: static/out/make/zip/darwin/x64/logseq-darwin-x64-${{ github.event.inputs.tag-version }}.zip
 
   release:
     needs: [ build-macos, build-linux, build-windows ]
     runs-on: ubuntu-latest
 
     steps:
-      - name: Download The MacOS X64 Artifact
+      - name: Download The MacOS X64 DMG Artifact
         uses: actions/download-artifact@v1
         with:
           name: Logseq-x64.dmg
           path: ./
 
+      - name: Download The MacOS X64 ZIP Artifact
+        uses: actions/download-artifact@v1
+        with:
+          name: Logseq-x64.zip
+          path: ./
+
       - name: Download The Linux Artifact
         uses: actions/download-artifact@v1
         with:
@@ -246,14 +258,25 @@ jobs:
           draft: ${{ github.event.inputs.is-draft }}
           prerelease: ${{ github.event.inputs.is-pre-release }}
 
-      - name: Upload MacOS X64 Artifact
-        id: upload-macos-x64-artifact
+      - name: Upload MacOS X64 ZIP Artifact
+        id: upload-macos-x64-zip-artifact
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./logseq-darwin-x64-${{ github.event.inputs.tag-version }}.zip
+          asset_name: logseq-darwin-x64-${{ github.event.inputs.tag-version }}.zip
+          asset_content_type: application/zip
+
+      - name: Upload MacOS X64 DMG Artifact
+        id: upload-macos-x64-dmg-artifact
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./Logseq-x64.dmg
+          asset_path: ./logseq-darwin-x64-${{ github.event.inputs.tag-version }}.dmg
           asset_name: logseq-darwin-x64-${{ github.event.inputs.tag-version }}.dmg
           asset_content_type: application/x-apple-diskimage