diff --git a/.github/scripts/run_ci.sh b/.github/scripts/run_ci.sh index 2bbac3283..1815b87b6 100755 --- a/.github/scripts/run_ci.sh +++ b/.github/scripts/run_ci.sh @@ -11,6 +11,7 @@ IS_PULL_REQUEST=0 IS_DEV_BRANCH=0 IS_LINUX=0 IS_MACOS=0 +IS_CONTINUOUS_INTEGRATION=1 if [ "$GITHUB_EVENT_NAME" == "pull_request" ]; then IS_PULL_REQUEST=1 diff --git a/BUILD.md b/BUILD.md index 3180f82d1..2bae3d7d8 100644 --- a/BUILD.md +++ b/BUILD.md @@ -1,5 +1,3 @@ - [![Travis Build Status](https://travis-ci.com/laurent22/joplin.svg?branch=master)](https://travis-ci.com/laurent22/joplin) [![Appveyor Build Status](https://ci.appveyor.com/api/projects/status/github/laurent22/joplin?branch=master&passingText=master%20-%20OK&svg=true)](https://ci.appveyor.com/project/laurent22/joplin) - # Building the applications The Joplin source code is hosted on a [monorepo](https://en.wikipedia.org/wiki/Monorepo) managed by Lerna. The usage of Lerna is mostly transparent as the needed commands have been moved to the root package.json and thus are invoked for example when running `npm install` or `npm run watch`. The main thing to know about Lerna is that it links the packages in the monorepo using `npm link`, so if you check the node_modules directory you will see links instead of actual directories for certain packages. This is something to keep in mind as these links can cause issues in some cases. diff --git a/packages/app-desktop/tools/compile-package-info.js b/packages/app-desktop/tools/compile-package-info.js index 8f1c7aa29..9ce77957f 100644 --- a/packages/app-desktop/tools/compile-package-info.js +++ b/packages/app-desktop/tools/compile-package-info.js @@ -27,7 +27,7 @@ module.exports = async function() { // Use stdio: 'pipe' so that execSync doesn't print error directly to stdout branch = execSync('git rev-parse --abbrev-ref HEAD', { stdio: 'pipe' }).toString().trim(); hash = execSync('git log --pretty="%h" -1', { stdio: 'pipe' }).toString().trim(); - // The builds in CI are done from a 'detached HEAD' state, thus the branch name will be 'HEAD' for Travis builds. + // The builds in CI are done from a 'detached HEAD' state, thus the branch name will be 'HEAD' for CI builds. } catch (err) { // Don't display error object as it's a "fatal" error, but // not for us, since is it not critical information diff --git a/packages/app-desktop/tools/notarizeMacApp.js b/packages/app-desktop/tools/notarizeMacApp.js index 3a9dfce5e..f45105855 100644 --- a/packages/app-desktop/tools/notarizeMacApp.js +++ b/packages/app-desktop/tools/notarizeMacApp.js @@ -25,8 +25,8 @@ module.exports = async function(params) { console.info('Checking if notarization should be done...'); - if (!process.env.TRAVIS || !process.env.TRAVIS_TAG) { - console.info(`Either not running in CI or not processing a tag - skipping notarization. process.env.TRAVIS = ${process.env.TRAVIS}; process.env.TRAVIS_TAG = ${process.env.TRAVIS}`); + if (!process.env.IS_CONTINUOUS_INTEGRATION || !process.env.GIT_TAG_NAME) { + console.info(`Either not running in CI or not processing a tag - skipping notarization. process.env.IS_CONTINUOUS_INTEGRATION = ${process.env.IS_CONTINUOUS_INTEGRATION}; process.env.GIT_TAG_NAME = ${process.env.GIT_TAG_NAME}`); return; } @@ -45,9 +45,8 @@ module.exports = async function(params) { console.log(`Notarizing ${appId} found at ${appPath}`); - // Every x seconds we print something to stdout, otherwise Travis will - // timeout the task after 10 minutes, and Apple notarization can take more - // time. + // Every x seconds we print something to stdout, otherwise CI may timeout + // the task after 10 minutes, and Apple notarization can take more time. const waitingIntervalId = setInterval(() => { console.log('.'); }, 60000);