From d2f892787b2fbf80b95e6b8127ceb168330b911e Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Mon, 23 Nov 2020 16:22:10 -0800 Subject: [PATCH] restrict the compatibility tests to CI --- packages/ember/config/ember-try.js | 58 ++++++++++++++--------------- packages/ember/package.json | 2 +- packages/ember/scripts/run_tests.sh | 10 +++++ 3 files changed, 40 insertions(+), 30 deletions(-) create mode 100644 packages/ember/scripts/run_tests.sh diff --git a/packages/ember/config/ember-try.js b/packages/ember/config/ember-try.js index fad8adf3cb71..db7044679f87 100644 --- a/packages/ember/config/ember-try.js +++ b/packages/ember/config/ember-try.js @@ -10,41 +10,41 @@ module.exports = async function() { name: 'ember-lts-3.12', npm: { devDependencies: { - 'ember-source': '~3.12.0' - } - } + 'ember-source': '~3.12.0', + }, + }, }, { name: 'ember-lts-3.16', npm: { devDependencies: { - 'ember-source': '~3.16.0' - } - } + 'ember-source': '~3.16.0', + }, + }, }, { name: 'ember-release', npm: { devDependencies: { - 'ember-source': await getChannelURL('release') - } - } + 'ember-source': await getChannelURL('release'), + }, + }, }, { name: 'ember-beta', npm: { devDependencies: { - 'ember-source': await getChannelURL('beta') - } - } + 'ember-source': await getChannelURL('beta'), + }, + }, }, { name: 'ember-canary', npm: { devDependencies: { - 'ember-source': await getChannelURL('canary') - } - } + 'ember-source': await getChannelURL('canary'), + }, + }, }, // The default `.travis.yml` runs this scenario via `npm test`, // not via `ember try`. It's still included here so that running @@ -53,21 +53,21 @@ module.exports = async function() { { name: 'ember-default', npm: { - devDependencies: {} - } + devDependencies: {}, + }, }, { name: 'ember-default-with-jquery', env: { EMBER_OPTIONAL_FEATURES: JSON.stringify({ - 'jquery-integration': true - }) + 'jquery-integration': true, + }), }, npm: { devDependencies: { - '@ember/jquery': '^0.5.1' - } - } + '@ember/jquery': '^0.5.1', + }, + }, }, { name: 'ember-classic', @@ -75,15 +75,15 @@ module.exports = async function() { EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'application-template-wrapper': true, 'default-async-observers': false, - 'template-only-glimmer-components': false - }) + 'template-only-glimmer-components': false, + }), }, npm: { ember: { - edition: 'classic' - } - } - } - ] + edition: 'classic', + }, + }, + }, + ], }; }; diff --git a/packages/ember/package.json b/packages/ember/package.json index cae2cbeff45a..204c1b990178 100644 --- a/packages/ember/package.json +++ b/packages/ember/package.json @@ -23,7 +23,7 @@ "lint:hbs": "ember-template-lint .", "lint:js": "eslint . --cache --cache-location '../../eslintcache/'", "start": "ember serve", - "test": "npm-run-all lint:* test:*", + "test": "bash ./scripts/run_tests.sh", "test:ember": "ember test", "test:ember-compatibility": "ember try:each", "prepublishOnly": "ember ts:precompile", diff --git a/packages/ember/scripts/run_tests.sh b/packages/ember/scripts/run_tests.sh new file mode 100644 index 000000000000..ac70e08d80b7 --- /dev/null +++ b/packages/ember/scripts/run_tests.sh @@ -0,0 +1,10 @@ +# running compatibilty tests takes ~15 min on a 2019 2.6 GHz 6-Core Intel i7 16" MacBook Pro w 32 GB of RAM, vs ~25 sec +# for the regular tests + +if [[ $TRAVIS || $GITHUB_ACTIONS ]]; then + echo "In CI - running tests against multiple versions of Ember" + yarn npm-run-all lint:* test:* +else + echo "Tests running locally - will only run tests against default version of Ember" + yarn npm-run-all lint:* test:ember +fi