From 464c49257a1729af4294512993929f7bba80fbdf Mon Sep 17 00:00:00 2001 From: antelle Date: Mon, 30 Nov 2020 21:16:17 +0100 Subject: [PATCH] building arm64.dmg --- .github/workflows/build.yaml | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index af87a9ec..9121f7b2 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -136,11 +136,16 @@ jobs: p12-password: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }} - name: Grunt run: grunt desktop-darwin ${{ github.repository != 'keeweb/keeweb' && '--skip-sign' || '' }} - - name: Upload dmg artifact + - name: Upload x64 dmg artifact uses: actions/upload-artifact@v1 with: - name: KeeWeb-${{ steps.get_tag.outputs.tag }}.mac.dmg - path: dist/desktop/KeeWeb-${{ steps.get_tag.outputs.tag }}.mac.dmg + name: KeeWeb-${{ steps.get_tag.outputs.tag }}.mac.x64.dmg + path: dist/desktop/KeeWeb-${{ steps.get_tag.outputs.tag }}.mac.x64.dmg + - name: Upload arm64 dmg artifact + uses: actions/upload-artifact@v1 + with: + name: KeeWeb-${{ steps.get_tag.outputs.tag }}.mac.arm64.dmg + path: dist/desktop/KeeWeb-${{ steps.get_tag.outputs.tag }}.mac.arm64.dmg win32: runs-on: windows-latest @@ -274,10 +279,15 @@ jobs: with: name: KeeWeb-${{ steps.get_tag.outputs.tag }}.linux.x86_64.rpm path: assets - - name: Download darwin.dmg artifact + - name: Download darwin.x64.dmg artifact uses: actions/download-artifact@v1 with: - name: KeeWeb-${{ steps.get_tag.outputs.tag }}.mac.dmg + name: KeeWeb-${{ steps.get_tag.outputs.tag }}.mac.x64.dmg + path: assets + - name: Download darwin.arm64.dmg artifact + uses: actions/download-artifact@v1 + with: + name: KeeWeb-${{ steps.get_tag.outputs.tag }}.mac.arm64.dmg path: assets - name: Download win32.ia32.exe artifact uses: actions/download-artifact@v1 @@ -414,14 +424,23 @@ jobs: asset_path: assets/KeeWeb-${{ steps.get_tag.outputs.tag }}.linux.x86_64.rpm asset_name: KeeWeb-${{ steps.get_tag.outputs.tag }}.linux.x86_64.rpm asset_content_type: application/octet-stream - - name: Upload darwin.dmg asset + - name: Upload darwin.x64.dmg asset uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: assets/KeeWeb-${{ steps.get_tag.outputs.tag }}.mac.dmg - asset_name: KeeWeb-${{ steps.get_tag.outputs.tag }}.mac.dmg + asset_path: assets/KeeWeb-${{ steps.get_tag.outputs.tag }}.mac.x64.dmg + asset_name: KeeWeb-${{ steps.get_tag.outputs.tag }}.mac.x64.dmg + asset_content_type: application/octet-stream + - name: Upload darwin.arm64.dmg asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: assets/KeeWeb-${{ steps.get_tag.outputs.tag }}.mac.arm64.dmg + asset_name: KeeWeb-${{ steps.get_tag.outputs.tag }}.mac.arm64.dmg asset_content_type: application/octet-stream - name: Upload win32.ia32.exe asset uses: actions/upload-release-asset@v1