Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 22 additions & 26 deletions .github/workflows/desktop.release.reuse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,21 +78,25 @@ jobs:

- run: yarn install --immutable

- name: Rebuild Electron Native Modules
run: yarn workspace @standardnotes/desktop rebuild:home-server

- run: yarn build:desktop

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the same as yarn run webpack --config desktop.webpack.prod.js which runs below I think?


- run: echo APP_VERSION=$(node -p "require('./../web/package.json').version") >> $GITHUB_ENV

- name: Compile for AppImage

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now done in each step after rebuilding

run: yarn run webpack --config desktop.webpack.prod.js
- name: AppImage
run: yarn run electron-builder --linux --x64 -c.linux.target=AppImage --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }}
run: |

@antsgar antsgar Jul 18, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The native modules are currently being rebuilt once before the packaging for both architectures happens. I suspect that might be the reason the native modules are always x64 and the arm64 Linux packages aren't running properly (see standardnotes/forum#3457). This is an attempt to fix the issue

yarn workspace @standardnotes/desktop rebuild:home-server
yarn run webpack --config desktop.webpack.prod.js
yarn run electron-builder --linux --x64 -c.linux.target=AppImage --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }}

- name: AppImageX64
run: yarn run electron-builder --linux --x64 -c.linux.target=AppImage --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }}
run: |
yarn workspace @standardnotes/desktop rebuild:home-server
yarn run webpack --config desktop.webpack.prod.js
yarn run electron-builder --linux --x64 -c.linux.target=AppImage --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }}
- name: AppImageArm64
run: yarn run electron-builder --linux --arm64 -c.linux.target=AppImage --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }}
run: |
yarn workspace @standardnotes/desktop rebuild:home-server --arch arm64
yarn run webpack --config desktop.webpack.prod.js
yarn run electron-builder --linux --arm64 -c.linux.target=AppImage --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }}
env:
npm_config_target_arch: 'arm64'

- name: Upload
uses: actions/upload-artifact@v4.0.0
Expand Down Expand Up @@ -125,19 +129,16 @@ jobs:

- run: yarn install --immutable

- name: Rebuild Electron Native Modules
run: yarn workspace @standardnotes/desktop rebuild:home-server

- run: yarn build:desktop

- run: echo APP_VERSION=$(node -p "require('./../web/package.json').version") >> $GITHUB_ENV

- name: Dir
run: |
yarn workspace @standardnotes/desktop rebuild:home-server
yarn run webpack --config desktop.webpack.prod.js
yarn run electron-builder --linux --x64 -c.linux.target=dir --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }}
- name: DirArm64
run: |
yarn workspace @standardnotes/desktop rebuild:home-server --arch arm64
yarn run webpack --config desktop.webpack.prod.js
yarn run electron-builder --linux --arm64 -c.linux.target=dir --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }}
env:
Expand Down Expand Up @@ -165,22 +166,19 @@ jobs:

- run: yarn install --immutable

- name: Rebuild Electron Native Modules
run: yarn workspace @standardnotes/desktop rebuild:home-server

- run: yarn build:desktop

- run: echo APP_VERSION=$(node -p "require('./../web/package.json').version") >> $GITHUB_ENV

- name: Deb
run: |
yarn workspace @standardnotes/desktop rebuild:home-server
yarn run webpack --config desktop.webpack.prod.js --env deb
yarn run electron-builder --linux --x64 -c.linux.target=deb --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }}
- name: DebArm64
env:
npm_config_target_arch: 'arm64'
USE_SYSTEM_FPM: 'true'
run: |
yarn workspace @standardnotes/desktop rebuild:home-server --arch arm64
yarn run webpack --config desktop.webpack.prod.js --env deb
yarn run electron-builder --linux --arm64 -c.linux.target=deb --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }}

Expand Down Expand Up @@ -317,7 +315,7 @@ jobs:

- name: Certificates Sync
run: |
smctl windows certsync
smctl windows certsync
shell: cmd

- name: Build & Sign With Electron Builder
Expand Down Expand Up @@ -373,8 +371,8 @@ jobs:
uses: softprops/action-gh-release@v1
with:
token: ${{ secrets.CI_PAT_TOKEN }}
tag_name: "@standardnotes/desktop@${{ env.APP_VERSION }}"
name: "Desktop ${{ env.APP_VERSION }}"
tag_name: '@standardnotes/desktop@${{ env.APP_VERSION }}'
name: 'Desktop ${{ env.APP_VERSION }}'
body: ${{ steps.release-notes.outputs.result }}
prerelease: true
draft: false
Expand All @@ -395,5 +393,3 @@ jobs:
token: ${{ secrets.CI_PAT_TOKEN }}
repository: ${{ secrets.RELEASES_EVENT_RECEIVING_REPO }}
event-type: releases-updated-event


Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion packages/desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"@babel/core": "*",
"@babel/preset-env": "*",
"@electron/notarize": "^3.0.0",
"@electron/rebuild": "3.6.0",
"@electron/rebuild": "3.6.1",

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's a fix on 3.6.1 which might affect rebuilding for different platforms electron/rebuild#1153

"@types/fs-extra": "^11.0.1",
"@types/lodash": "^4.14.189",
"@types/mime-types": "^2.1.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/mobile/fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ platform :ios do
run_precheck_before_submit: false,
submission_information: { add_id_info_uses_idfa: false },
release_notes: {
'default': 'Fixes and improvements.'
'en-US': 'Fixes and improvements.'

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Attempt to fix the current error in the mobile workflow, which fails in this command stating the release_notes field is missing

}
)
end
Expand Down
2 changes: 1 addition & 1 deletion packages/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "3.198.7",
"license": "AGPL-3.0",
"main": "dist/app.js",
"author": "Standard Notes",
"author": "Standard Notes.",
"private": true,
"files": [
"dist"
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3763,9 +3763,9 @@ __metadata:
languageName: node
linkType: hard

"@electron/rebuild@npm:3.6.0":
version: 3.6.0
resolution: "@electron/rebuild@npm:3.6.0"
"@electron/rebuild@npm:3.6.1":
version: 3.6.1
resolution: "@electron/rebuild@npm:3.6.1"
dependencies:
"@malept/cross-spawn-promise": ^2.0.0
chalk: ^4.0.0
Expand All @@ -3783,7 +3783,7 @@ __metadata:
yargs: ^17.0.1
bin:
electron-rebuild: lib/cli.js
checksum: 0dbf320b71ba5bc31ff7e0f46b157a16d56a7ee2b2d503ad60b46fe4673f9ba63c5b270a00e44856564e6a9fd5da216034a26eb3321679c40b681156ab6289a2
checksum: 90766c7341997a54319bc215014de829d3f3ab1976fd80c4fa9846f5672bdf2b6c7b0f87fe5edee290caf6c7e9a60774607b46b97dea20ac65c5567af7f694ae
languageName: node
linkType: hard

Expand Down Expand Up @@ -7850,7 +7850,7 @@ __metadata:
"@babel/core": "*"
"@babel/preset-env": "*"
"@electron/notarize": ^3.0.0
"@electron/rebuild": 3.6.0
"@electron/rebuild": 3.6.1
"@electron/remote": ^2.1.2
"@standardnotes/domain-core": ^1.40.0
"@standardnotes/electron-clear-data": 1.1.1
Expand Down
Loading