diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index c0c28d80c..07614bbc2 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -17,9 +17,7 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: volta-cli/action@v1 - with: - node-version: 10.x + - uses: volta-cli/action@v4 - run: yarn install --frozen-lockfile --ignore-engines - run: yarn lint - run: yarn test @@ -31,9 +29,7 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: volta-cli/action@v1 - with: - node-version: 12.x + - uses: volta-cli/action@v4 - run: yarn install --no-lockfile - run: yarn test @@ -64,9 +60,7 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: volta-cli/action@v1 - with: - node-version: 12.x + - uses: volta-cli/action@v4 - name: install dependencies run: yarn install --frozen-lockfile - name: test @@ -74,7 +68,7 @@ jobs: types: runs-on: ubuntu-latest - + needs: test strategy: @@ -86,9 +80,7 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: volta-cli/action@v1 - with: - node-version: 12.x + - uses: volta-cli/action@v4 - name: install dependencies run: yarn install --frozen-lockfile - name: install TS version diff --git a/addon-test-support/@ember/test-helpers/-internal/build-registry.ts b/addon-test-support/@ember/test-helpers/-internal/build-registry.ts index 45777ccfe..e3a5a9a32 100644 --- a/addon-test-support/@ember/test-helpers/-internal/build-registry.ts +++ b/addon-test-support/@ember/test-helpers/-internal/build-registry.ts @@ -118,7 +118,7 @@ export default function (resolver: Resolver) { // correctly for the tests; that's why we import and call setupContainer // here; also see https://github.com/emberjs/data/issues/4071 for context let setupContainer = require('ember-data/setup-container')['default']; - setupContainer(registry || container); + setupContainer(owner); } return { diff --git a/config/ember-try.js b/config/ember-try.js index 55ab9b625..85b756d6c 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -100,6 +100,7 @@ module.exports = async function () { npm: { devDependencies: { 'ember-source': await getChannelURL('release'), + '@ember/string': '3.1.1', }, }, }, @@ -108,6 +109,7 @@ module.exports = async function () { npm: { devDependencies: { 'ember-source': await getChannelURL('beta'), + '@ember/string': '3.1.1', }, }, }, @@ -116,6 +118,7 @@ module.exports = async function () { npm: { devDependencies: { 'ember-source': await getChannelURL('canary'), + '@ember/string': '3.1.1', }, }, }, diff --git a/package.json b/package.json index 2a2641ff6..71de4b79e 100644 --- a/package.json +++ b/package.json @@ -155,7 +155,7 @@ } }, "volta": { - "node": "12.22.4", + "node": "14.21.3", "yarn": "1.22.4" }, "typesVersions": {