From cb58bbd4cc7c4efcae3d24f20c39cf787cddb9bc Mon Sep 17 00:00:00 2001 From: Jamie Ruderman Date: Wed, 1 Oct 2025 09:25:18 -0700 Subject: [PATCH 1/2] fix: common assets compile with electon compile --- .circleci/config.yml | 3 --- electron/package.json | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 58402e66b..59b8eb80b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,9 +18,6 @@ jobs: # a collection of steps - run: name: install-npm command: npm install - - run: - name: build-common - command: npx tsc -p common/tsconfig.json - run: name: compile-electron command: cd electron && npm run compile diff --git a/electron/package.json b/electron/package.json index fca0bcebf..95c8a022b 100644 --- a/electron/package.json +++ b/electron/package.json @@ -16,7 +16,8 @@ "build-frontend": "cd ../ && npm run build-frontend", "build-electron": "cross-env NODE_ARCH=$npm_config_arch electron-builder", "clean": "rimraf build/* dist/*", - "compile": "run-s typecheck sync-assets", + "compile": "run-s typecheck-common typecheck sync-assets", + "typecheck-common": "tsc -p ../common/tsconfig.json", "typecheck": "tsc -p tsconfig.json", "sync-assets": "node ./scripts/sync-backend-assets.js", "copy-env": "cd .. && npm run copy-env", From dec73255eea6dfc53005645502a49efb798d2a60 Mon Sep 17 00:00:00 2001 From: Jamie Ruderman Date: Wed, 1 Oct 2025 09:33:36 -0700 Subject: [PATCH 2/2] fix: set android build action to not automatically send changes for review --- .github/workflows/build-android.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml index 3d4f9f291..5de87cffa 100644 --- a/.github/workflows/build-android.yml +++ b/.github/workflows/build-android.yml @@ -132,6 +132,7 @@ jobs: status: inProgress inAppUpdatePriority: 0 userFraction: 0.2 + changesNotSentForReview: true # whatsNewDirectory: distribution/whatsnew # mappingFile: app/build/outputs/mapping/release/mapping.txt - # debugSymbols: app/build/intermediates/merged_native_libs/release/out/lib/ \ No newline at end of file + # debugSymbols: app/build/intermediates/merged_native_libs/release/out/lib/