From 5362aa258c277a5d13d0065ccaf515ce7d0d84b7 Mon Sep 17 00:00:00 2001 From: Andelf Date: Wed, 10 Apr 2024 01:03:37 +0800 Subject: [PATCH 1/3] ci(build): refine windows sign --- .github/workflows/build-desktop-release.yml | 28 ++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-desktop-release.yml b/.github/workflows/build-desktop-release.yml index 700580f97..d31c4d281 100644 --- a/.github/workflows/build-desktop-release.yml +++ b/.github/workflows/build-desktop-release.yml @@ -363,10 +363,20 @@ jobs: # CODE_SIGN_CERTIFICATE_FILE: ../codesign.pfx # CODE_SIGN_CERTIFICATE_PASSWORD: ${{ secrets.CODE_SIGN_CERTIFICATE_PASSWORD }} - - name: Save Artifact + - name: Save Artifact for Code Signing run: | mkdir builds mv static\out\make\squirrel.windows\x64\*.exe builds\Logseq-win-x64-${{ steps.ref.outputs.version }}.exe + + - name: Upload Artifact for Code Signing + uses: actions/upload-artifact@v3 + with: + name: logseq-win64-unsigned-builds + path: builds + + - name: Save Artifact + run: | + rm builds\*.exe mv static\out\make\squirrel.windows\x64\*.nupkg builds\Logseq-win-x64-${{ steps.ref.outputs.version }}-full.nupkg mv static\out\make\zip\win32\x64\*.zip builds\Logseq-win-x64-${{ steps.ref.outputs.version }}.zip mv static\out\make\squirrel.windows\x64\RELEASES builds\RELEASES @@ -551,7 +561,7 @@ jobs: - name: Download Windows Artifact uses: actions/download-artifact@v3 with: - name: logseq-win64-builds + name: logseq-win64-unsigned-builds path: ./builds - name: Sign Windows Executable @@ -602,6 +612,12 @@ jobs: name: logseq-win64-signed-builds path: ./ + - name: Download The Windows Artifact + uses: actions/download-artifact@v3 + with: + name: logseq-win64-builds + path: ./ + - name: Download Android Artifacts uses: actions/download-artifact@v3 with: @@ -669,12 +685,18 @@ jobs: name: logseq-linux-arm64-builds path: ./ - - name: Download The Windows Artifact + - name: Download The Windows Artifact (Signed) uses: actions/download-artifact@v3 with: name: logseq-win64-signed-builds path: ./ + - name: Download The Windows Artifact + uses: actions/download-artifact@v3 + with: + name: logseq-win64-builds + path: ./ + - name: Download Android Artifacts uses: actions/download-artifact@v3 if: ${{ github.event_name == 'schedule' || github.event.inputs.build-android == 'true' }} From 4bb74f89443d09895def9d9e91ba06ab1df045ed Mon Sep 17 00:00:00 2001 From: sty <11363816+thief-sty@users.noreply.github.com> Date: Wed, 10 Apr 2024 18:18:51 +0200 Subject: [PATCH 2/3] e2e-test: add "DEBUG=pw:api" to "e2e-test" script in package.json (fix #11195) (#11217) * package.json: add 'DEBUG=pw:api' to 'e2e-test' script Co-authored-by: Andelf --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6c3da4635..a4ef28c29 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "dev-electron-app": "gulp electron", "release-electron": "run-s gulp:build && gulp electronMaker", "debug-electron": "cd static/ && yarn electron:debug", - "e2e-test": "cross-env CI=true npx playwright test --reporter github", + "e2e-test": "cross-env DEBUG=pw:api CI=true npx playwright test --reporter github", "run-android-release": "yarn clean && yarn release-app && rm -rf ./public/static && rm -rf ./static/js/*.map && mv static ./public && npx cap sync android && npx cap run android", "run-ios-release": "yarn clean && yarn release-app && rm -rf ./public/static && rm -rf ./static/js/*.map && mv static ./public && npx cap sync ios && npx cap run ios", "clean": "gulp clean", From 7341b27c033974495c46236c9991349ad93632db Mon Sep 17 00:00:00 2001 From: sty <11363816+thief-sty@users.noreply.github.com> Date: Wed, 10 Apr 2024 00:41:44 +0200 Subject: [PATCH 3/3] docs/develop-logseq.md: specify that dependencies in /static also exist --- docs/develop-logseq.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/develop-logseq.md b/docs/develop-logseq.md index f03a2d4ce..7de909538 100644 --- a/docs/develop-logseq.md +++ b/docs/develop-logseq.md @@ -55,6 +55,9 @@ The released files will be at `static/` directory. ``` bash yarn install +cd static +yarn install +cd .. ``` 2. Compile to JavaScript and open the dev app