Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update CI and drop support for Node 12 #902

Merged
merged 5 commits into from
Dec 8, 2022
Merged

Update CI and drop support for Node 12 #902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
03c8d40
update to current verions of Node and Yarn
mikrostew Nov 29, 2022
4d8cac3
fix the legacy mocha tests
mikrostew Nov 29, 2022
7730353
fix the ember-try tests
mikrostew Nov 29, 2022
439ed4e
update workerpool for node16 fix
mikrostew Nov 29, 2022
5533d60
I think this test is timing out for Windows
mikrostew Dec 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

strategy:
matrix:
node-version: [14.x, 12.x]
node-version: [16.x, 14.x]
os: [ubuntu-latest, windows-latest]

steps:
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:

strategy:
matrix:
node-version: [14.x, 12.x]
node-version: [16.x, 14.x]
os: [ubuntu-latest, windows-latest]

steps:
Expand All @@ -76,7 +76,7 @@ jobs:

strategy:
matrix:
node-version: [14.x, 12.x]
node-version: [16.x, 14.x]
os: [ubuntu-latest, windows-latest]

steps:
Expand All @@ -103,7 +103,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [14.x, 12.x]
node-version: [16.x, 14.x]

steps:
- name: Checkout Code
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"npm": false
},
"volta": {
"node": "14.17.3",
"yarn": "1.22.10"
"node": "16.18.1",
"yarn": "1.22.19"
}
}
4 changes: 4 additions & 0 deletions packages/ember-cli-fastboot/config/ember-try.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');
module.exports = async function () {
return {
useYarn: true,
// don't use default `--no-lockfile` option, which has been causing these to fail
buildManagerOptions(/* scenario */) {
return ['--ignore-engines'];
},
scenarios: [
{
name: 'ember-lts-3.16',
Expand Down
2 changes: 1 addition & 1 deletion packages/ember-cli-fastboot/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
"webpack": "^5.58.1"
},
"engines": {
"node": "12.* || 14.* || >=16"
"node": "14.* || 16.* || >=18"
},
"publishConfig": {
"registry": "https://registry.npmjs.org/"
Expand Down
3 changes: 2 additions & 1 deletion packages/ember-cli-fastboot/test/fastboot-config-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@ describe('FastBoot config', function () {

return app
.create('fastboot-config', {
skipNpm: true,
emberVersion: 'latest',
emberDataVersion: 'latest',
})
.then(function () {
app.editPackageJSON((pkg) => {
delete pkg.devDependencies['ember-fetch'];
delete pkg.devDependencies['ember-welcome-page'];
// needed because @ember-data/store does `FastBoot.require('crypto')`
pkg.fastbootDependencies = ['crypto'];
});
return app.run('npm', 'install');
})
Expand Down
3 changes: 2 additions & 1 deletion packages/ember-cli-fastboot/test/fastboot-location-config-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@ describe('FastBootLocation Configuration', function () {

return app
.create('fastboot-location-config', {
skipNpm: true,
emberVersion: 'latest',
emberDataVersion: 'latest',
})
.then(function () {
app.editPackageJSON((pkg) => {
delete pkg.devDependencies['ember-fetch'];
delete pkg.devDependencies['ember-welcome-page'];
// needed because @ember-data/store does `FastBoot.require('crypto')`
pkg.fastbootDependencies = ['crypto'];
});
return app.run('npm', 'install');
})
Expand Down
3 changes: 2 additions & 1 deletion packages/ember-cli-fastboot/test/fastboot-location-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@ describe('FastBootLocation', function () {

return app
.create('fastboot-location', {
skipNpm: true,
emberVersion: 'latest',
emberDataVersion: 'latest',
})
.then(function () {
app.editPackageJSON((pkg) => {
delete pkg.devDependencies['ember-fetch'];
delete pkg.devDependencies['ember-welcome-page'];
// needed because @ember-data/store does `FastBoot.require('crypto')`
pkg.fastbootDependencies = ['crypto'];
});
return app.run('npm', 'install');
})
Expand Down
3 changes: 2 additions & 1 deletion packages/ember-cli-fastboot/test/package-json-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,15 @@ describe('generating package.json', function () {
before(function () {
return customApp
.create('customized-outputpaths', {
skipNpm: true,
emberVersion: 'latest',
emberDataVersion: 'latest',
})
.then(function () {
customApp.editPackageJSON((pkg) => {
delete pkg.devDependencies['ember-fetch'];
delete pkg.devDependencies['ember-welcome-page'];
// needed because @ember-data/store does `FastBoot.require('crypto')`
pkg.fastbootDependencies = ['crypto'];
});
return customApp.run('npm', 'install');
})
Expand Down
3 changes: 2 additions & 1 deletion packages/ember-cli-fastboot/test/request-details-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ function injectMiddlewareAddon(app) {
};
delete pkg.devDependencies['ember-fetch'];
delete pkg.devDependencies['ember-welcome-page'];
// needed because @ember-data/store does `FastBoot.require('crypto')`
pkg.fastbootDependencies = ['crypto'];
});
return app.run('npm', 'install');
}
Expand All @@ -32,7 +34,6 @@ describe('request details', function () {

return app
.create('request', {
skipNpm: true,
emberVersion: 'latest',
emberDataVersion: 'latest',
})
Expand Down
3 changes: 2 additions & 1 deletion packages/ember-cli-fastboot/test/root-url-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@ describe('rootUrl acceptance', function () {

return app
.create('root-url', {
skipNpm: true,
emberVersion: 'latest',
emberDataVersion: 'latest',
})
.then(function () {
app.editPackageJSON((pkg) => {
delete pkg.devDependencies['ember-fetch'];
delete pkg.devDependencies['ember-welcome-page'];
// needed because @ember-data/store does `FastBoot.require('crypto')`
pkg.fastbootDependencies = ['crypto'];
});
return app.run('npm', 'install');
})
Expand Down
2 changes: 1 addition & 1 deletion test-packages/basic-app/test/asset-rewriting-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const execa = require("execa");
chai.use(require('chai-fs'));

describe('rewriting HTML', function () {
this.timeout(100000);
this.timeout(150000);

it('builds an index.html that points to the browser build', async function () {

Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17937,9 +17937,9 @@ workerpool@6.1.5, workerpool@^6.1.4:
integrity sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==

workerpool@^2.3.0:
version "2.3.3"
resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-2.3.3.tgz#49a70089bd55e890d68cc836a19419451d7c81d7"
integrity sha512-L1ovlYHp6UObYqElXXpbd214GgbEKDED0d3sj7pRdFXjNkb2+un/AUcCkceHizO0IVI6SOGGncrcjozruCkRgA==
version "2.3.4"
resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-2.3.4.tgz#661335ded59a08c01ca009e30cc96929a7b4b0aa"
integrity sha512-c2EWrgB9IKHi1jbf4LG9sxKgHYOY+Ej5li6siEGtFecCXWG7eQOqATPEJ0rg1KFETXROEkErc1t5XiNrLG666Q==
dependencies:
object-assign "4.1.1"

Expand Down