Skip to content

Commit

Permalink
[build] Fix CI jobs
Browse files Browse the repository at this point in the history
  • Loading branch information
charlag committed Jan 7, 2022
1 parent 2861d06 commit 7ca87fc
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ jobs:
- name: npm install, build, and test
run: |
npm ci
npm -ws run build
npm run build-packages
npm test
1 change: 1 addition & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ pipeline {
}
steps {
sh 'npm ci'
sh 'npm run build-packages'
sh 'node dist release'
// excluding web-specific and mobile specific parts which we don't need in desktop
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'
Expand Down
6 changes: 3 additions & 3 deletions doc/BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ own. If you prefer the auto-update feature, you can use the official [mail](http
2. Switch into the repository directory: `cd tutanota`
3. Checkout the latest web release tag: `git checkout tutanota-release-xxx`
4. run `npm ci` to install dependencies.
5. Build packages: `npm -ws run build` (might need to do it multiple times)
5. Build packages: `npm run build-packages`
6. Build the web part: `node dist prod`
7. Switch into the build directory: `cd build/dist`
8. Run the local server. Either use `node server` or `python -m SimpleHTTPServer 9000`.
Expand All @@ -37,7 +37,7 @@ If you prefer the auto-update feature, download the app from the Google Play Sto
2. Switch into the Tutanota directory: `cd tutanota`
3. Checkout the latest android release tag: `git checkout tutanota-android-release-xxx`
4. Install dependencies: `npm ci`
5. Build packages: `npm -ws run build` (might need to do it multiple times)
5. Build packages: `npm run build-packages`
6. Create a keystore if you don't have
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"`
7.
Expand Down Expand Up @@ -65,7 +65,7 @@ Keep in mind that your own build of Tutanota Desktop will not update automatical

### Build:

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

The client for your platform will be in `build/desktop/`. Note that you can add `--unpacked` to the build command to
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
},
"type": "module",
"scripts": {
"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",
"start": "./start-desktop.sh",
"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",
"testapi": "cd test && node --icu-data-dir=../node_modules/full-icu test api",
Expand Down

0 comments on commit 7ca87fc

Please sign in to comment.