Skip to content

Commit c02722b

Browse files
authored
Merge pull request #902 from mikrostew/fix-ci
Update CI and drop support for Node 12
2 parents 703e788 + 5533d60 commit c02722b

File tree

12 files changed

+27
-17
lines changed

12 files changed

+27
-17
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
strategy:
2727
matrix:
28-
node-version: [14.x, 12.x]
28+
node-version: [16.x, 14.x]
2929
os: [ubuntu-latest, windows-latest]
3030

3131
steps:
@@ -54,7 +54,7 @@ jobs:
5454

5555
strategy:
5656
matrix:
57-
node-version: [14.x, 12.x]
57+
node-version: [16.x, 14.x]
5858
os: [ubuntu-latest, windows-latest]
5959

6060
steps:
@@ -76,7 +76,7 @@ jobs:
7676

7777
strategy:
7878
matrix:
79-
node-version: [14.x, 12.x]
79+
node-version: [16.x, 14.x]
8080
os: [ubuntu-latest, windows-latest]
8181

8282
steps:
@@ -103,7 +103,7 @@ jobs:
103103
strategy:
104104
fail-fast: false
105105
matrix:
106-
node-version: [14.x, 12.x]
106+
node-version: [16.x, 14.x]
107107

108108
steps:
109109
- name: Checkout Code

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"npm": false
5959
},
6060
"volta": {
61-
"node": "14.17.3",
62-
"yarn": "1.22.10"
61+
"node": "16.18.1",
62+
"yarn": "1.22.19"
6363
}
6464
}

packages/ember-cli-fastboot/config/ember-try.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');
66
module.exports = async function () {
77
return {
88
useYarn: true,
9+
// don't use default `--no-lockfile` option, which has been causing these to fail
10+
buildManagerOptions(/* scenario */) {
11+
return ['--ignore-engines'];
12+
},
913
scenarios: [
1014
{
1115
name: 'ember-lts-3.16',

packages/ember-cli-fastboot/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
"webpack": "^5.58.1"
102102
},
103103
"engines": {
104-
"node": "12.* || 14.* || >=16"
104+
"node": "14.* || 16.* || >=18"
105105
},
106106
"publishConfig": {
107107
"registry": "https://registry.npmjs.org/"

packages/ember-cli-fastboot/test/fastboot-config-test.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@ describe('FastBoot config', function () {
1616

1717
return app
1818
.create('fastboot-config', {
19-
skipNpm: true,
2019
emberVersion: 'latest',
2120
emberDataVersion: 'latest',
2221
})
2322
.then(function () {
2423
app.editPackageJSON((pkg) => {
2524
delete pkg.devDependencies['ember-fetch'];
2625
delete pkg.devDependencies['ember-welcome-page'];
26+
// needed because @ember-data/store does `FastBoot.require('crypto')`
27+
pkg.fastbootDependencies = ['crypto'];
2728
});
2829
return app.run('npm', 'install');
2930
})

packages/ember-cli-fastboot/test/fastboot-location-config-test.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@ describe('FastBootLocation Configuration', function () {
1616

1717
return app
1818
.create('fastboot-location-config', {
19-
skipNpm: true,
2019
emberVersion: 'latest',
2120
emberDataVersion: 'latest',
2221
})
2322
.then(function () {
2423
app.editPackageJSON((pkg) => {
2524
delete pkg.devDependencies['ember-fetch'];
2625
delete pkg.devDependencies['ember-welcome-page'];
26+
// needed because @ember-data/store does `FastBoot.require('crypto')`
27+
pkg.fastbootDependencies = ['crypto'];
2728
});
2829
return app.run('npm', 'install');
2930
})

packages/ember-cli-fastboot/test/fastboot-location-test.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,15 @@ describe('FastBootLocation', function () {
1515

1616
return app
1717
.create('fastboot-location', {
18-
skipNpm: true,
1918
emberVersion: 'latest',
2019
emberDataVersion: 'latest',
2120
})
2221
.then(function () {
2322
app.editPackageJSON((pkg) => {
2423
delete pkg.devDependencies['ember-fetch'];
2524
delete pkg.devDependencies['ember-welcome-page'];
25+
// needed because @ember-data/store does `FastBoot.require('crypto')`
26+
pkg.fastbootDependencies = ['crypto'];
2627
});
2728
return app.run('npm', 'install');
2829
})

packages/ember-cli-fastboot/test/package-json-test.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,15 @@ describe('generating package.json', function () {
1818
before(function () {
1919
return customApp
2020
.create('customized-outputpaths', {
21-
skipNpm: true,
2221
emberVersion: 'latest',
2322
emberDataVersion: 'latest',
2423
})
2524
.then(function () {
2625
customApp.editPackageJSON((pkg) => {
2726
delete pkg.devDependencies['ember-fetch'];
2827
delete pkg.devDependencies['ember-welcome-page'];
28+
// needed because @ember-data/store does `FastBoot.require('crypto')`
29+
pkg.fastbootDependencies = ['crypto'];
2930
});
3031
return customApp.run('npm', 'install');
3132
})

packages/ember-cli-fastboot/test/request-details-test.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ function injectMiddlewareAddon(app) {
1818
};
1919
delete pkg.devDependencies['ember-fetch'];
2020
delete pkg.devDependencies['ember-welcome-page'];
21+
// needed because @ember-data/store does `FastBoot.require('crypto')`
22+
pkg.fastbootDependencies = ['crypto'];
2123
});
2224
return app.run('npm', 'install');
2325
}
@@ -32,7 +34,6 @@ describe('request details', function () {
3234

3335
return app
3436
.create('request', {
35-
skipNpm: true,
3637
emberVersion: 'latest',
3738
emberDataVersion: 'latest',
3839
})

packages/ember-cli-fastboot/test/root-url-test.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@ describe('rootUrl acceptance', function () {
1616

1717
return app
1818
.create('root-url', {
19-
skipNpm: true,
2019
emberVersion: 'latest',
2120
emberDataVersion: 'latest',
2221
})
2322
.then(function () {
2423
app.editPackageJSON((pkg) => {
2524
delete pkg.devDependencies['ember-fetch'];
2625
delete pkg.devDependencies['ember-welcome-page'];
26+
// needed because @ember-data/store does `FastBoot.require('crypto')`
27+
pkg.fastbootDependencies = ['crypto'];
2728
});
2829
return app.run('npm', 'install');
2930
})

0 commit comments

Comments
 (0)