Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2025-12-16 11:47:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

desktop: pass --config arg to electron-builder everywhere

Browse Source
This commit is contained in:
Abdullah Atta
2025-02-28 12:23:27 +05:00
committed by Abdullah Atta
parent 1adddbdb4c
commit 1862802052
4 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/desktop.publish.yml vendored
View File

@@ -185,7 +185,7 @@ jobs:
CSC_KEY_PASSWORD: ${{ secrets.mac_certs_password }} CSC_KEY_PASSWORD: ${{ secrets.mac_certs_password }}
run: | run: |
npx nx run release --project @notesnook/desktop -- --variant=mas npx nx run release --project @notesnook/desktop -- --variant=mas
yarn electron-builder --mac mas --universal -p never yarn electron-builder --config=electron-builder.config.js --mac mas --universal -p never
working-directory: ./apps/desktop working-directory: ./apps/desktop
- name: Build zip and dmg - name: Build zip and dmg
@@ -199,9 +199,9 @@ jobs:
run: | run: |
npx nx run release --project @notesnook/desktop npx nx run release --project @notesnook/desktop
if [ ${{ inputs.publish-github }} == true ]; then if [ ${{ inputs.publish-github }} == true ]; then
yarn electron-builder --mac zip dmg --arm64 --x64 -p always yarn electron-builder --config=electron-builder.config.js --mac zip dmg --arm64 --x64 -p always
else else
yarn electron-builder --mac zip dmg --arm64 --x64 -p never yarn electron-builder --config=electron-builder.config.js --mac zip dmg --arm64 --x64 -p never
fi fi
working-directory: ./apps/desktop working-directory: ./apps/desktop
@@ -263,7 +263,7 @@ jobs:
- name: Build snap - name: Build snap
if: inputs.publish-snap if: inputs.publish-snap
run: | run: |
yarn electron-builder --linux snap:x64 -p never yarn electron-builder --config=electron-builder.config.js --linux snap:x64 -p never
working-directory: ./apps/desktop working-directory: ./apps/desktop
- name: Build AppImage - name: Build AppImage
@@ -271,9 +271,9 @@ jobs:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: | run: |
if [ ${{ inputs.publish-github }} == true ]; then if [ ${{ inputs.publish-github }} == true ]; then
yarn electron-builder --linux AppImage:x64 AppImage:arm64 -p always yarn electron-builder --config=electron-builder.config.js --linux AppImage:x64 AppImage:arm64 -p always
else else
yarn electron-builder --linux AppImage:x64 AppImage:arm64 -p never yarn electron-builder --config=electron-builder.config.js --linux AppImage:x64 AppImage:arm64 -p never
fi fi
working-directory: ./apps/desktop working-directory: ./apps/desktop
@@ -333,8 +333,8 @@ jobs:
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }} AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
run: | run: |
if ($${{ inputs.publish-github }} -eq $true) { if ($${{ inputs.publish-github }} -eq $true) {
yarn electron-builder --win --publish always yarn electron-builder --config=electron-builder.config.js --win --publish always
} else { } else {
yarn electron-builder --win --publish never yarn electron-builder --config=electron-builder.config.js --win --publish never
} }
working-directory: ./apps/desktop working-directory: ./apps/desktop

20
.github/workflows/desktop.tests.yml vendored
View File

@@ -69,12 +69,11 @@ jobs:
- name: Build app - name: Build app
run: | run: |
yarn electron-builder --mac --dir --x64 yarn electron-builder --config=electron-builder.config.js --mac --dir --x64
working-directory: ./apps/desktop working-directory: ./apps/desktop
- name: Run tests x64 - name: Run tests x64
run: | run: npm run test
EXECUTABLE_PATH=output/mac/Notesnook.app/Contents/MacOS/Notesnook npm run test
working-directory: ./apps/desktop working-directory: ./apps/desktop
- name: Upload test results - name: Upload test results
@@ -114,12 +113,11 @@ jobs:
- name: Build app - name: Build app
run: | run: |
yarn electron-builder --mac --dir --arm64 yarn electron-builder --config=electron-builder.config.js --mac --dir --arm64
working-directory: ./apps/desktop working-directory: ./apps/desktop
- name: Run tests arm64 - name: Run tests arm64
run: | run: npm run test
EXECUTABLE_PATH=output/mac-arm64/Notesnook.app/Contents/MacOS/Notesnook npm run test
working-directory: ./apps/desktop working-directory: ./apps/desktop
- name: Upload test results - name: Upload test results
@@ -165,12 +163,11 @@ jobs:
- name: Build app - name: Build app
run: | run: |
yarn electron-builder --linux --dir --arm64 --x64 yarn electron-builder --config=electron-builder.config.js --linux --dir --arm64 --x64
working-directory: ./apps/desktop working-directory: ./apps/desktop
- name: Run tests - name: Run tests
run: | run: xvfb-run --auto-servernum --server-args="-screen 0 1920x1080x24" -- npm run test
EXECUTABLE_PATH=output/linux-unpacked/notesnook xvfb-run --auto-servernum --server-args="-screen 0 1920x1080x24" -- npm run test
working-directory: ./apps/desktop working-directory: ./apps/desktop
- name: Upload test results - name: Upload test results
@@ -216,12 +213,11 @@ jobs:
- name: Build app - name: Build app
run: | run: |
npx cross-env NOTESNOOK_STAGING=true yarn electron-builder --win --dir --arm64 --x64 npx cross-env NOTESNOOK_STAGING=true yarn electron-builder --config=electron-builder.config.js --win --dir --arm64 --x64
working-directory: ./apps/desktop working-directory: ./apps/desktop
- name: Run tests - name: Run tests
run: | run: npm run test
npx cross-env EXECUTABLE_PATH=output/win-unpacked/Notesnook.exe npm run test
working-directory: ./apps/desktop working-directory: ./apps/desktop
- name: Upload test results - name: Upload test results

6
apps/desktop/README.md
View File

@@ -58,13 +58,13 @@ This will compile and run the app in production mode but it won't generate any p
npm run release -- --rebuild npm run release -- --rebuild
# For macOS # For macOS
npx electron-builder --mac dmg --arm64 --x64 -publish never npx electron-builder --config=electron-builder.config.js --mac dmg --arm64 --x64 -publish never
# For Linux (AppImage) # For Linux (AppImage)
npx electron-builder --linux AppImage:x64 AppImage:arm64 -publish never npx electron-builder --config=electron-builder.config.js --linux AppImage:x64 AppImage:arm64 -publish never
# For Windows # For Windows
npx electron-builder --win --publish never npx electron-builder --config=electron-builder.config.js --win --publish never
``` ```
Feel free to play around with the `electron-builder` command to get the packages you need. `npx electron-builder --help` is a great resource to learn different commands & platforms supported by `electron-builder`. Feel free to play around with the `electron-builder` command to get the packages you need. `npx electron-builder --help` is a great resource to learn different commands & platforms supported by `electron-builder`.

4
apps/desktop/scripts/build.mjs
View File

@@ -59,7 +59,9 @@ if (args.variant === "mas") {
await exec(`yarn run build`); await exec(`yarn run build`);
if (args.run) { if (args.run) {
await exec(`yarn electron-builder --dir --${process.arch}`); await exec(
`yarn electron-builder --dir --${process.arch} --config=electron-builder.config.js`
);
if (process.platform === "win32") { if (process.platform === "win32") {
await exec(`.\\output\\win-unpacked\\Notesnook.exe`); await exec(`.\\output\\win-unpacked\\Notesnook.exe`);
} else if (process.platform === "darwin") { } else if (process.platform === "darwin") {