Skip to content

Commit eadb046

Browse files
authored
Updated CI (#294)
* chore: Updated dependencies (CI) * refactor: Removed unused code * chore: Skipped ember-beta and ember-canary to avoid issues with 7.0 pre-release * chore: Added changeset
1 parent c29fc4a commit eadb046

File tree

3 files changed

+32
-71
lines changed

3 files changed

+32
-71
lines changed

.changeset/fifty-parks-hope.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"ember-container-query": patch
3+
"test-app": patch
4+
---
5+
6+
Skipped ember-beta and ember-canary to avoid issues with 7.0 pre-release

.github/workflows/ci.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
uses: actions/checkout@v6
2828

2929
- name: Set up pnpm
30-
uses: pnpm/action-setup@v4
30+
uses: pnpm/action-setup@v5
3131

3232
- name: Use Node.js ${{ env.NODE_VERSION }}
3333
uses: actions/setup-node@v6
@@ -52,7 +52,7 @@ jobs:
5252
uses: actions/checkout@v6
5353

5454
- name: Set up pnpm
55-
uses: pnpm/action-setup@v4
55+
uses: pnpm/action-setup@v5
5656

5757
- name: Use Node.js ${{ env.NODE_VERSION }}
5858
uses: actions/setup-node@v6
@@ -68,7 +68,7 @@ jobs:
6868
working-directory: 'docs-app'
6969

7070
- name: Upload docs-app
71-
uses: actions/upload-artifact@v6
71+
uses: actions/upload-artifact@v7
7272
with:
7373
name: dist
7474
path: docs-app/dist
@@ -115,7 +115,7 @@ jobs:
115115
uses: actions/checkout@v6
116116

117117
- name: Set up pnpm
118-
uses: pnpm/action-setup@v4
118+
uses: pnpm/action-setup@v5
119119

120120
- name: Use Node.js ${{ env.NODE_VERSION }}
121121
uses: actions/setup-node@v6
@@ -127,7 +127,7 @@ jobs:
127127
run: pnpm install --frozen-lockfile
128128

129129
- name: Download docs-app
130-
uses: actions/download-artifact@v7
130+
uses: actions/download-artifact@v8
131131
with:
132132
name: dist
133133
path: docs-app/dist
@@ -156,7 +156,7 @@ jobs:
156156
uses: actions/checkout@v6
157157

158158
- name: Set up pnpm
159-
uses: pnpm/action-setup@v4
159+
uses: pnpm/action-setup@v5
160160

161161
- name: Use Node.js ${{ env.NODE_VERSION }}
162162
uses: actions/setup-node@v6
@@ -183,7 +183,7 @@ jobs:
183183
uses: actions/checkout@v6
184184

185185
- name: Set up pnpm
186-
uses: pnpm/action-setup@v4
186+
uses: pnpm/action-setup@v5
187187

188188
- name: Use Node.js ${{ env.NODE_VERSION }}
189189
uses: actions/setup-node@v6
@@ -193,7 +193,7 @@ jobs:
193193

194194
- id: set-test-matrix
195195
name: Set test matrix
196-
run: echo "matrix=$(pnpx -s @embroider/try list)" >> $GITHUB_OUTPUT
196+
run: echo "matrix=$(pnpx @embroider/try list)" >> $GITHUB_OUTPUT
197197
working-directory: 'test-app'
198198

199199

@@ -210,7 +210,7 @@ jobs:
210210
uses: actions/checkout@v6
211211

212212
- name: Set up pnpm
213-
uses: pnpm/action-setup@v4
213+
uses: pnpm/action-setup@v5
214214

215215
- name: Use Node.js ${{ env.NODE_VERSION }}
216216
uses: actions/setup-node@v6
@@ -219,7 +219,7 @@ jobs:
219219
node-version: ${{ env.NODE_VERSION }}
220220

221221
- name: Make file changes
222-
run: pnpm dlx @embroider/try apply ${{ matrix.name }}
222+
run: pnpx @embroider/try apply ${{ matrix.name }}
223223
working-directory: 'test-app'
224224

225225
- name: Install dependencies

test-app/.try.mjs

Lines changed: 16 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,18 @@
1-
const dependenciesForCompatibility = {
2-
// '@ember/optional-features': '^2.3.0',
3-
// '@embroider/compat': '^4.1.13',
4-
// 'ember-cli': '~6.10.0',
5-
// 'ember-auto-import': '^2.12.0',
6-
};
7-
8-
const filesForCompatibility = {
9-
// 'config/optional-features.json': [
10-
// `{`,
11-
// ` "application-template-wrapper": false,`,
12-
// ` "default-async-observers": true,`,
13-
// ` "jquery-integration": false,`,
14-
// ` "no-implicit-route-model": true,`,
15-
// ` "template-only-glimmer-components": true`,
16-
// `}`,
17-
// ].join('\n'),
18-
// 'ember-cli-build.js': [
19-
// `const { compatBuild } = require('@embroider/compat');`,
20-
// `const EmberApp = require('ember-cli/lib/broccoli/ember-app');`,
21-
// ``,
22-
// `module.exports = async function (defaults) {`,
23-
// ` const { buildOnce } = await import('@embroider/vite');`,
24-
// ``,
25-
// ` const app = new EmberApp(defaults, {`,
26-
// ` 'ember-cli-babel': {`,
27-
// ` enableTypeScriptTransform: true,`,
28-
// ` },`,
29-
// ` });`,
30-
// ``,
31-
// ` return compatBuild(app, buildOnce);`,
32-
// `};`,
33-
// ].join('\n'),
34-
};
35-
361
export default {
372
packageManager: 'pnpm',
383
scenarios: [
394
{
40-
env: {
41-
ENABLE_COMPAT_BUILD: true,
42-
},
43-
files: filesForCompatibility,
445
name: 'ember-lts-4.12',
456
npm: {
467
devDependencies: {
47-
...dependenciesForCompatibility,
488
'ember-source': '~4.12.0',
499
},
5010
},
5111
},
5212
{
53-
env: {
54-
ENABLE_COMPAT_BUILD: true,
55-
},
56-
files: filesForCompatibility,
5713
name: 'ember-lts-5.12',
5814
npm: {
5915
devDependencies: {
60-
...dependenciesForCompatibility,
6116
'ember-source': '~5.12.0',
6217
},
6318
},
@@ -78,21 +33,21 @@ export default {
7833
},
7934
},
8035
},
81-
{
82-
name: 'ember-beta',
83-
npm: {
84-
devDependencies: {
85-
'ember-source': 'npm:ember-source@beta',
86-
},
87-
},
88-
},
89-
{
90-
name: 'ember-canary',
91-
npm: {
92-
devDependencies: {
93-
'ember-source': 'npm:ember-source@alpha',
94-
},
95-
},
96-
},
36+
// {
37+
// name: 'ember-beta',
38+
// npm: {
39+
// devDependencies: {
40+
// 'ember-source': 'npm:ember-source@beta',
41+
// },
42+
// },
43+
// },
44+
// {
45+
// name: 'ember-canary',
46+
// npm: {
47+
// devDependencies: {
48+
// 'ember-source': 'npm:ember-source@alpha',
49+
// },
50+
// },
51+
// },
9752
],
9853
};

0 commit comments

Comments
 (0)