diff --git a/.github/workflows/desktop.release.reuse.yml b/.github/workflows/desktop.release.reuse.yml index 323e98b9a..1c5bf7ce4 100644 --- a/.github/workflows/desktop.release.reuse.yml +++ b/.github/workflows/desktop.release.reuse.yml @@ -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 - - run: echo APP_VERSION=$(node -p "require('./../web/package.json').version") >> $GITHUB_ENV - - - name: Compile for AppImage - 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: | + 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 @@ -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: @@ -165,15 +166,11 @@ 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 @@ -181,6 +178,7 @@ jobs: 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 }} @@ -317,7 +315,7 @@ jobs: - name: Certificates Sync run: | - smctl windows certsync + smctl windows certsync shell: cmd - name: Build & Sign With Electron Builder @@ -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 @@ -395,5 +393,3 @@ jobs: token: ${{ secrets.CI_PAT_TOKEN }} repository: ${{ secrets.RELEASES_EVENT_RECEIVING_REPO }} event-type: releases-updated-event - - diff --git a/.yarn/cache/@electron-rebuild-npm-3.6.0-81cf7c7220-0dbf320b71.zip b/.yarn/cache/@electron-rebuild-npm-3.6.0-81cf7c7220-0dbf320b71.zip deleted file mode 100644 index ea6512cce..000000000 Binary files a/.yarn/cache/@electron-rebuild-npm-3.6.0-81cf7c7220-0dbf320b71.zip and /dev/null differ diff --git a/.yarn/cache/@electron-rebuild-npm-3.6.1-c8b3306caf-90766c7341.zip b/.yarn/cache/@electron-rebuild-npm-3.6.1-c8b3306caf-90766c7341.zip new file mode 100644 index 000000000..d47659302 Binary files /dev/null and b/.yarn/cache/@electron-rebuild-npm-3.6.1-c8b3306caf-90766c7341.zip differ diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 8a68bd28e..3173755b0 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -55,7 +55,7 @@ "@babel/core": "*", "@babel/preset-env": "*", "@electron/notarize": "^3.0.0", - "@electron/rebuild": "3.6.0", + "@electron/rebuild": "3.6.1", "@types/fs-extra": "^11.0.1", "@types/lodash": "^4.14.189", "@types/mime-types": "^2.1.1", diff --git a/packages/mobile/fastlane/Fastfile b/packages/mobile/fastlane/Fastfile index dfc3d749c..0b812f2e1 100755 --- a/packages/mobile/fastlane/Fastfile +++ b/packages/mobile/fastlane/Fastfile @@ -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.' } ) end diff --git a/packages/web/package.json b/packages/web/package.json index 542581155..2e47afbf5 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -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" diff --git a/yarn.lock b/yarn.lock index 87ca3d482..8dd9bc858 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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 @@ -3783,7 +3783,7 @@ __metadata: yargs: ^17.0.1 bin: electron-rebuild: lib/cli.js - checksum: 0dbf320b71ba5bc31ff7e0f46b157a16d56a7ee2b2d503ad60b46fe4673f9ba63c5b270a00e44856564e6a9fd5da216034a26eb3321679c40b681156ab6289a2 + checksum: 90766c7341997a54319bc215014de829d3f3ab1976fd80c4fa9846f5672bdf2b6c7b0f87fe5edee290caf6c7e9a60774607b46b97dea20ac65c5567af7f694ae languageName: node linkType: hard @@ -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