From 32283e973b83b072516835d3ab850f110f6621e1 Mon Sep 17 00:00:00 2001 From: Abdullah Atta Date: Thu, 29 Sep 2022 19:46:41 +0500 Subject: [PATCH] desktop: use custom fork of `electron-builder-notarize` --- .github/workflows/desktop.publish.yml | 41 ++++++++++++++------------- apps/web/desktop/package-lock.json | 15 +++++----- apps/web/desktop/package.json | 2 +- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.github/workflows/desktop.publish.yml b/.github/workflows/desktop.publish.yml index 0919f560a..bd8cef70c 100644 --- a/.github/workflows/desktop.publish.yml +++ b/.github/workflows/desktop.publish.yml @@ -62,6 +62,27 @@ jobs: name: build path: apps/web/build/**/* + + - name: Collect app metadata + id: app_metadata + working-directory: ./apps/web/desktop + run: | + echo ::set-output name=app_version::$(cat package.json | jq -r .version) + + - name: Package desktop build + run: | + zip -r ./notesnook_build_v${{ steps.app_metadata.outputs.app_version }}.zip ./apps/web/desktop/build/ + echo "Build folder archived to ./notesnook_build_v${{ steps.app_metadata.outputs.app_version }}.zip" + + - name: Upload desktop build + uses: softprops/action-gh-release@v1 + if: inputs.publish-github + with: + draft: true + name: Notesnook Desktop v${{ steps.app_metadata.outputs.app_version }} + tag_name: v${{ steps.app_metadata.outputs.app_version }} + files: ./notesnook_build_v${{ steps.app_metadata.outputs.app_version }}.zip + build-macos: name: Build for macOS needs: build @@ -122,8 +143,6 @@ jobs: APPLE_API_KEY: ${{ secrets.api_key }} APPLE_API_KEY_ID: ${{ secrets.api_key_id }} APPLE_API_KEY_ISSUER: ${{ secrets.api_key_issuer_id }} - API_KEY_ID: ${{ secrets.api_key_id }} - API_KEY_ISSUER_ID: ${{ secrets.api_key_issuer_id }} run: | npm run build:mas npx electron-builder --mac mas --universal -p never @@ -137,8 +156,6 @@ jobs: APPLE_API_KEY: ${{ secrets.api_key }} APPLE_API_KEY_ID: ${{ secrets.api_key_id }} APPLE_API_KEY_ISSUER: ${{ secrets.api_key_issuer_id }} - API_KEY_ID: ${{ secrets.api_key_id }} - API_KEY_ISSUER_ID: ${{ secrets.api_key_issuer_id }} run: | npm run build if [ ${{ inputs.publish-github }} == true ]; then @@ -233,22 +250,6 @@ jobs: snapcraft upload --release=stable ./dist/notesnook_linux_amd64.snap working-directory: ./apps/web/desktop - - name: Package desktop build - run: | - mv ./apps/web/desktop/build/ ./notesnook_build_v${{ steps.app_metadata.outputs.app_version }} - echo "Moved build folder to ./notesnook_build_v${{ steps.app_metadata.outputs.app_version }}" - - - name: Upload desktop build - uses: fnkr/github-action-ghr@v1 - if: inputs.publish-github - env: - GHR_COMPRESS: xz - GHR_DELETE: false - GHR_REPLACE: true - GHR_PATH: ./notesnook_build_v${{ steps.app_metadata.outputs.app_version }} - GITHUB_REF: refs/tags/v${{ steps.app_metadata.outputs.app_version }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - build-windows: name: Build for Windows needs: build diff --git a/apps/web/desktop/package-lock.json b/apps/web/desktop/package-lock.json index 59a8c5a43..90eef23b7 100644 --- a/apps/web/desktop/package-lock.json +++ b/apps/web/desktop/package-lock.json @@ -1,12 +1,12 @@ { "name": "@notesnook/desktop", - "version": "2.2.0", + "version": "2.2.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@notesnook/desktop", - "version": "2.2.0", + "version": "2.2.1", "dependencies": { "diary": "^0.3.1", "electron-better-ipc": "^2.0.1", @@ -18,7 +18,7 @@ "@types/node-fetch": "^2.6.2", "electron": "^19.0.8", "electron-builder": "^23.3.3", - "electron-builder-notarize": "^1.5.0", + "electron-builder-notarize": "github:streetwriters/electron-builder-notarize", "electron-reloader": "^1.2.3", "esbuild": "^0.15.8" } @@ -1647,9 +1647,9 @@ }, "node_modules/electron-builder-notarize": { "version": "1.5.0", - "resolved": "https://registry.npmjs.org/electron-builder-notarize/-/electron-builder-notarize-1.5.0.tgz", - "integrity": "sha512-kbVCnZX3pCKTXiPhyoMjCZYSQnwS04QmlTM2NB2D/2LCsab5UJA0Me9ZqDT3W35ENPglf1WYDKT+tx9i+xuaPA==", + "resolved": "git+ssh://git@github.com/streetwriters/electron-builder-notarize.git#cbcc1c87436d291c66bac4c172f498cf5da8e6ca", "dev": true, + "license": "MIT", "dependencies": { "dotenv": "^8.2.0", "electron-notarize": "^1.1.1", @@ -6154,10 +6154,9 @@ } }, "electron-builder-notarize": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/electron-builder-notarize/-/electron-builder-notarize-1.5.0.tgz", - "integrity": "sha512-kbVCnZX3pCKTXiPhyoMjCZYSQnwS04QmlTM2NB2D/2LCsab5UJA0Me9ZqDT3W35ENPglf1WYDKT+tx9i+xuaPA==", + "version": "git+ssh://git@github.com/streetwriters/electron-builder-notarize.git#cbcc1c87436d291c66bac4c172f498cf5da8e6ca", "dev": true, + "from": "electron-builder-notarize@https://github.com/streetwriters/electron-builder-notarize", "requires": { "dotenv": "^8.2.0", "electron-notarize": "^1.1.1", diff --git a/apps/web/desktop/package.json b/apps/web/desktop/package.json index 386fac38f..bcbf750f8 100644 --- a/apps/web/desktop/package.json +++ b/apps/web/desktop/package.json @@ -19,7 +19,7 @@ "@types/node-fetch": "^2.6.2", "electron": "^19.0.8", "electron-builder": "^23.3.3", - "electron-builder-notarize": "^1.5.0", + "electron-builder-notarize": "github:streetwriters/electron-builder-notarize", "electron-reloader": "^1.2.3", "esbuild": "^0.15.8" },