Merge pull request #858 from mainmatter/fix-ci

Fix CI tests for beta/canary channels

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ on:
   pull_request: {}
 
 env:
-  PNPM_VERSION: 7.18.2
+  PNPM_VERSION: 8.6.0
 
 concurrency:
    group: ci-${{ github.head_ref || github.ref }}
@@ -27,7 +27,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v3
         with:
-          node-version: 14.x
+          node-version: 16.x
           cache: pnpm
       - name: Install Dependencies
         run: pnpm install
@@ -48,7 +48,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v3
         with:
-          node-version: 14.x
+          node-version: 16.x
           cache: pnpm
       - name: Install Dependencies
         run: pnpm install
@@ -58,7 +58,7 @@ jobs:
   try-scenarios:
     name: ${{ matrix.try-scenario }}
     runs-on: ubuntu-latest
-    needs: 'test'
+    # needs: 'test'
 
     strategy:
       fail-fast: false
@@ -84,7 +84,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v3
         with:
-          node-version: 14.x
+          node-version: 18.x
           cache: pnpm
       - name: Install Dependencies
         run: pnpm install

config/ember-try.js

@@ -21,6 +21,7 @@ module.exports = async function () {
         npm: {
           devDependencies: {
             'ember-source': '~3.8.0',
+            '@ember/test-helpers': '2.7.0',
             'ember-decorators-polyfill': '^1.1.5',
           },
         },
@@ -30,6 +31,7 @@ module.exports = async function () {
         npm: {
           devDependencies: {
             'ember-source': '~3.12.0',
+            '@ember/test-helpers': '2.7.0',
           },
         },
       },

package.json

@@ -43,8 +43,9 @@
   "devDependencies": {
     "@babel/eslint-parser": "7.19.1",
     "@ember/optional-features": "2.0.0",
+    "@ember/string": "^3.1.1",
     "@ember/test-helpers": "2.9.0",
-    "@embroider/test-setup": "2.0.2",
+    "@embroider/test-setup": "3.0.2",
     "@release-it-plugins/lerna-changelog": "5.0.0",
     "broccoli-asset-rev": "3.0.0",
     "ember-cli": "4.9.2",
@@ -53,7 +54,6 @@
     "ember-cli-sri": "2.1.1",
     "ember-cli-terser": "4.0.2",
     "ember-disable-prototype-extensions": "1.1.3",
-    "ember-export-application-global": "2.0.1",
     "ember-load-initializers": "2.1.2",
     "ember-maybe-import-regenerator": "1.0.0",
     "ember-qunit": "5.1.5",
@@ -81,7 +81,7 @@
     "webpack": "5.75.0"
   },
   "engines": {
-    "node": "12.* || >= 14.*"
+    "node": "12.* || >= 16.*"
   },
   "changelog": {
     "repo": "mainmatter/ember-promise-modals",