Merge pull request #46 from mansona/fix-ember-try

Fix ember-try issues
mansona · Jun 28, 2022 · 73c2592 · 73c2592
2 parents 58583fb + 7b8045e
commit 73c2592
Show file tree

Hide file tree

Showing 4 changed files with 686 additions and 1,232 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: ${{ env.NODE_VERSION }}
-      - run: npm i -g npm@7
+      - run: npm i -g npm@8
       - run: npm ci
       - run: npm run lint
 
@@ -36,7 +36,7 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: ${{ env.NODE_VERSION }}
-      - run: npm i -g npm@7
+      - run: npm i -g npm@8
       - run: npm ci
       - run: npm run test:ember
 
@@ -49,7 +49,7 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: ${{ env.NODE_VERSION }}
-      - run: npm i -g npm@7
+      - run: npm i -g npm@8
       - run: npm install --no-package-lock
       - run: npm run test:ember
 
@@ -81,7 +81,7 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: ${{ env.NODE_VERSION }}
-      - run: npm i -g npm@7
+      - run: npm i -g npm@8
       - run: npm ci
 
       - name: test

diff --git a/config/ember-try.js b/config/ember-try.js
@@ -11,6 +11,7 @@ module.exports = async function () {
         npm: {
           devDependencies: {
             'ember-source': '~3.4.0',
+            '@ember/test-helpers': '2.7.0',
           },
         },
       },
@@ -60,6 +61,9 @@ module.exports = async function () {
           devDependencies: {
             'ember-source': await getChannelURL('release'),
           },
+          overrides: {
+            'ember-source': '$ember-source',
+          },
         },
       },
       {
@@ -68,6 +72,9 @@ module.exports = async function () {
           devDependencies: {
             'ember-source': await getChannelURL('beta'),
           },
+          overrides: {
+            'ember-source': '$ember-source',
+          },
         },
       },
       {
@@ -76,6 +83,9 @@ module.exports = async function () {
           devDependencies: {
             'ember-source': await getChannelURL('canary'),
           },
+          overrides: {
+            'ember-source': '$ember-source',
+          },
         },
       },
       {