Skip to content

Commit 7ca87fc

Browse files
committed
[build] Fix CI jobs
1 parent 2861d06 commit 7ca87fc

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ jobs:
2020
- name: npm install, build, and test
2121
run: |
2222
npm ci
23-
npm -ws run build
23+
npm run build-packages
2424
npm test

Jenkinsfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ pipeline {
3434
}
3535
steps {
3636
sh 'npm ci'
37+
sh 'npm run build-packages'
3738
sh 'node dist release'
3839
// excluding web-specific and mobile specific parts which we don't need in desktop
3940
stash includes: 'build/dist/**', excludes: '**/braintree.html, **/index.html, **/app.html, **/desktop.html, **/index-index.js, **/index-app.js, **/index-desktop.js, **/dist/sw.js', name: 'web_base'

doc/BUILDING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ own. If you prefer the auto-update feature, you can use the official [mail](http
1414
2. Switch into the repository directory: `cd tutanota`
1515
3. Checkout the latest web release tag: `git checkout tutanota-release-xxx`
1616
4. run `npm ci` to install dependencies.
17-
5. Build packages: `npm -ws run build` (might need to do it multiple times)
17+
5. Build packages: `npm run build-packages`
1818
6. Build the web part: `node dist prod`
1919
7. Switch into the build directory: `cd build/dist`
2020
8. Run the local server. Either use `node server` or `python -m SimpleHTTPServer 9000`.
@@ -37,7 +37,7 @@ If you prefer the auto-update feature, download the app from the Google Play Sto
3737
2. Switch into the Tutanota directory: `cd tutanota`
3838
3. Checkout the latest android release tag: `git checkout tutanota-android-release-xxx`
3939
4. Install dependencies: `npm ci`
40-
5. Build packages: `npm -ws run build` (might need to do it multiple times)
40+
5. Build packages: `npm run build-packages`
4141
6. Create a keystore if you don't have
4242
one: `keytool -genkey -noprompt -keystore MyKeystore.jks -alias tutaKey -keyalg RSA -keysize 2048 -validity 10000 -deststoretype pkcs12 -storepass CHANGEME -keypass CHANGEME -dname "CN=com.example"`
4343
7.
@@ -65,7 +65,7 @@ Keep in mind that your own build of Tutanota Desktop will not update automatical
6565

6666
### Build:
6767

68-
1. Build packages: `npm -ws run build` (might need to do it multiple times)
68+
1. Build packages: `npm run build-packages`
6969
2. Run `node dist --custom-desktop-release`.
7070

7171
The client for your platform will be in `build/desktop/`. Note that you can add `--unpacked` to the build command to

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
},
99
"type": "module",
1010
"scripts": {
11+
"build-packages": "npm run build -w packages/tutanota-test-utils && npm run build -w packages/tutanota-utils && npm run build -w packages/tutanota-crypto && npm run build -w packages/tutanota-build-server",
1112
"start": "./start-desktop.sh",
1213
"test": "npm run test -ws && cd test && node --icu-data-dir=../node_modules/full-icu test api -c && node --icu-data-dir=../node_modules/full-icu test client",
1314
"testapi": "cd test && node --icu-data-dir=../node_modules/full-icu test api",

0 commit comments

Comments
 (0)