Skip to content

Commit 506f778

Browse files
committed
De-embroider the test-app
1 parent d4ebd92 commit 506f778

File tree

5 files changed

+36
-31
lines changed

5 files changed

+36
-31
lines changed

.github/workflows/ci.yml

+24
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,27 @@ jobs:
4545
- name: Run Tests
4646
run: pnpm test
4747

48+
49+
try-scenarios:
50+
name: ${{ matrix.try-scenario }}
51+
runs-on: ubuntu-latest
52+
needs: 'test'
53+
timeout-minutes: 10
54+
55+
strategy:
56+
fail-fast: false
57+
matrix:
58+
try-scenario:
59+
- ember-lts-3.28
60+
- ember-lts-4.12
61+
- ember-lts-5.8
62+
- ember-release
63+
- ember-beta
64+
- ember-canary
65+
66+
steps:
67+
- uses: actions/checkout@v4
68+
- uses: wyvox/action-setup-pnpm@v3
69+
- name: Run Tests
70+
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }} --skip-cleanup
71+
working-directory: test-app

pnpm-lock.yaml

-22
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test-app/config/ember-try.js

+10-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
'use strict';
22

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

65
module.exports = async function () {
76
return {
87
usePnpm: true,
98
scenarios: [
9+
{
10+
name: 'ember-lts-3.28',
11+
npm: {
12+
devDependencies: {
13+
'ember-source': '~3.28.0',
14+
},
15+
},
16+
},
1017
{
1118
name: 'ember-lts-4.12',
1219
npm: {
@@ -16,10 +23,10 @@ module.exports = async function () {
1623
},
1724
},
1825
{
19-
name: 'ember-lts-5.4',
26+
name: 'ember-lts-5.8',
2027
npm: {
2128
devDependencies: {
22-
'ember-source': '~5.4.0',
29+
'ember-source': '~5.8.0',
2330
},
2431
},
2532
},
@@ -47,8 +54,6 @@ module.exports = async function () {
4754
},
4855
},
4956
},
50-
embroiderSafe(),
51-
embroiderOptimized(),
5257
],
5358
};
5459
};

test-app/ember-cli-build.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,5 @@ module.exports = function (defaults) {
99
},
1010
});
1111

12-
const { maybeEmbroider } = require('@embroider/test-setup');
13-
return maybeEmbroider(app);
12+
return app.toTree();
1413
};

test-app/package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
"@ember/optional-features": "^2.1.0",
3232
"@ember/string": "^3.1.1",
3333
"@ember/test-helpers": "^3.3.0",
34-
"@embroider/test-setup": "^3.0.1",
3534
"@glimmer/component": "^1.1.2",
3635
"@glimmer/tracking": "^1.1.2",
3736
"broccoli-asset-rev": "^3.0.0",
@@ -80,4 +79,4 @@
8079
"ember": {
8180
"edition": "octane"
8281
}
83-
}
82+
}

0 commit comments

Comments
 (0)