Merge branch 'master' into feat/db

pull/11293/head
charlie 2024-04-15 07:58:14 +08:00
commit 2ba9f28026
3 changed files with 29 additions and 4 deletions

View File

@ -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' }}

View File

@ -68,6 +68,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

View File

@ -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",