Skip to content

Commit a3e8783

Browse files
committed
chore: improve CircleCI setup
1 parent 5c360e5 commit a3e8783

File tree

1 file changed

+18
-61
lines changed

1 file changed

+18
-61
lines changed

.circleci/config.yml

Lines changed: 18 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
name: Build Electron app
3737
command: pnpm run build:electron:publish
3838

39-
deploy-win-appx:
39+
deploy-win:
4040
executor:
4141
name: win/default
4242
shell: bash.exe
@@ -48,55 +48,18 @@ jobs:
4848
- run:
4949
name: Install pnpm package manager
5050
command: npm install -g pnpm@latest
51-
- restore_cache:
52-
name: Restore pnpm Package Cache
53-
keys:
54-
- &deploy-win-pnpm-cache win-pnpm-packages-{{ checksum "pnpm-lock.yaml" }}-2
5551
- run:
5652
name: Install node dependencies
5753
command: pnpm install
58-
- save_cache:
59-
name: Save pnpm Package Cache
60-
key: *deploy-win-pnpm-cache
61-
paths:
62-
- node_modules
6354
- run:
6455
name: Build packages
6556
command: pnpm run repo:build
6657
- run:
6758
name: Build AppX
68-
command: pnpm run build:electron:publish
69-
70-
deploy-win-nsis:
71-
executor:
72-
name: win/default
73-
shell: bash.exe
74-
steps:
75-
- checkout
76-
- run:
77-
name: Install Node.js 18
78-
command: nvm install 18 && nvm use 18
79-
- run:
80-
name: Install pnpm package manager
81-
command: npm install -g pnpm@latest
82-
- restore_cache:
83-
name: Restore pnpm Package Cache
84-
keys:
85-
- &deploy-win-pnpm-cache win-pnpm-packages-{{ checksum "pnpm-lock.yaml" }}-2
86-
- run:
87-
name: Install node dependencies
88-
command: pnpm install
89-
- save_cache:
90-
name: Save pnpm Package Cache
91-
key: *deploy-win-pnpm-cache
92-
paths:
93-
- node_modules
94-
- run:
95-
name: Build packages
96-
command: pnpm run repo:build
97-
- run:
98-
name: Build NSIS
99-
command: NSIS=true pnpm run build:electron:publish
59+
command: |
60+
unset CSC_LINK
61+
unset CSC_KEY_PASSWORD
62+
pnpm run build:electron:publish
10063
10164
deploy-linux:
10265
docker:
@@ -161,15 +124,23 @@ jobs:
161124
command: sudo gem install fastlane
162125
- run:
163126
name: Create Android keystore
164-
command: echo $BASE64_KEYSTORE | base64 -d | tee apps/client/src-capacitor/android/app/deepnotes.keystore > /dev/null
127+
command: |
128+
cd apps/client/src-capacitor/android/app
129+
echo $BASE64_KEYSTORE | base64 -d > deepnotes.keystore
130+
ls
165131
- run:
166132
name: Create keystore.properties
167133
command: |
134+
cd apps/client/src-capacitor/android
168135
printf 'releaseKeyAlias=%s\nreleaseKeyPassword=%s\nreleaseKeyStore=%s\nreleaseStorePassword=%s' \
169-
$RELEASE_KEY_ALIAS $RELEASE_KEY_PASSWORD $RELEASE_KEYSTORE $RELEASE_STORE_PASSWORD > tee apps/client/src-capacitor/android/keystore.properties
136+
$RELEASE_KEY_ALIAS $RELEASE_KEY_PASSWORD $RELEASE_KEYSTORE $RELEASE_STORE_PASSWORD > keystore.properties
137+
ls
170138
- run:
171139
name: Create Google Play key
172-
command: echo $GOOGLE_PLAY_KEY > apps/client/src-capacitor/android/fastlane/deepnotes-google-api-secret.json
140+
command: |
141+
cd apps/client/src-capacitor/android/fastlane
142+
echo $GOOGLE_PLAY_KEY > deepnotes-google-api-secret.json
143+
ls
173144
- run: |
174145
cd apps/client/src-capacitor/android
175146
bundle install
@@ -182,26 +153,12 @@ workflows:
182153

183154
deploy:
184155
jobs:
185-
- deploy-linux:
186-
filters:
187-
branches:
188-
only: main
189-
190-
- deploy-win-appx:
191-
filters:
192-
branches:
193-
only: main
194-
- deploy-win-nsis:
195-
filters:
196-
branches:
197-
only: main
198-
199-
- deploy-macos:
156+
- deploy-win:
200157
filters:
201158
branches:
202159
only: main
203160

204161
- deploy-android:
205162
filters:
206163
branches:
207-
only: main
164+
only: main

0 commit comments

Comments
 (0)