Skip to content

Commit 3b2e57c

Browse files
committed
update which ember envs are tested on CI
1. When running "normal" tests, only run for pinned version of ember. 2. When running on CI, test pinned version, 4.0, release & embroider. 3. Run `yarn test:all` to test all CI versions locally
1 parent 7eedf46 commit 3b2e57c

File tree

4 files changed

+32
-60
lines changed

4 files changed

+32
-60
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ jobs:
390390
runs-on: ubuntu-latest
391391
strategy:
392392
matrix:
393-
scenario: [ember-release, ember-beta, ember-classic, ember-4.0]
393+
scenario: [ember-release, embroider-optimized, ember-4.0]
394394
steps:
395395
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
396396
uses: actions/checkout@v3

packages/ember/config/ember-try.js

Lines changed: 29 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
const getChannelURL = require('ember-source-channel-url');
4-
const { embroiderSafe } = require('@embroider/test-setup');
4+
const { embroiderOptimized } = require('@embroider/test-setup');
55

66
/**
77
* Pick which versions of ember against which to test based on whether the tests are running locally, as part of a PR,
@@ -19,50 +19,41 @@ module.exports = async function () {
1919
'ember-source': await getChannelURL('release'),
2020
},
2121
},
22-
allowedToFail: true,
2322
},
24-
];
25-
26-
// in CI we add a few more tests - LTS and embroider (which is an ember compiler)
27-
if (process.env.GITHUB_ACTIONS) {
28-
scenarios = scenarios.concat([
29-
{
30-
name: 'ember-4.0',
31-
npm: {
32-
devDependencies: {
33-
'ember-source': '~4.0.1',
34-
},
23+
{
24+
name: 'ember-4.0',
25+
npm: {
26+
devDependencies: {
27+
'ember-source': '~4.0.1',
3528
},
3629
},
37-
embroiderSafe(),
38-
]);
39-
scenarios = scenarios.concat([
40-
{
41-
name: 'ember-beta',
42-
npm: {
43-
devDependencies: {
44-
'ember-source': await getChannelURL('beta'),
45-
},
30+
},
31+
embroiderOptimized(),
32+
{
33+
name: 'ember-beta',
34+
npm: {
35+
devDependencies: {
36+
'ember-source': await getChannelURL('beta'),
4637
},
47-
allowedToFail: true,
4838
},
49-
{
50-
name: 'ember-classic',
51-
env: {
52-
EMBER_OPTIONAL_FEATURES: JSON.stringify({
53-
'application-template-wrapper': true,
54-
'default-async-observers': false,
55-
'template-only-glimmer-components': false,
56-
}),
57-
},
58-
npm: {
59-
ember: {
60-
edition: 'classic',
61-
},
39+
allowedToFail: true,
40+
},
41+
{
42+
name: 'ember-classic',
43+
env: {
44+
EMBER_OPTIONAL_FEATURES: JSON.stringify({
45+
'application-template-wrapper': true,
46+
'default-async-observers': false,
47+
'template-only-glimmer-components': false,
48+
}),
49+
},
50+
npm: {
51+
ember: {
52+
edition: 'classic',
6253
},
6354
},
64-
]);
65-
}
55+
},
56+
];
6657

6758
return {
6859
useYarn: true,

packages/ember/package.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,8 @@
2626
"lint:js": "eslint . --cache --cache-location '../../eslintcache/'",
2727
"lint:ts": "tsc",
2828
"start": "ember serve",
29-
"test:ember": "ember test",
30-
"test:ember-all": "ember try:each",
31-
"test": "npm-run-all --print-name \"lint\" \"test:*\"",
32-
"test:all": "node ./scripts/run-CI-tests.js",
29+
"test": "ember test",
30+
"test:all": "ember try:each",
3331
"prepack": "ember ts:precompile",
3432
"postpack": "ember ts:clean"
3533
},

packages/ember/scripts/run-CI-tests.js

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)