Skip to content

Commit e9b750e

Browse files
authored
Merge pull request #560 from adopted-ember-addons/kg-reenable-scenarios
2 parents a38f334 + 1bd7cbc commit e9b750e

File tree

3 files changed

+48
-28
lines changed

3 files changed

+48
-28
lines changed

.github/workflows/ci.yml

+13-14
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ jobs:
1818
timeout-minutes: 10
1919

2020
steps:
21-
- uses: actions/checkout@v3
22-
- uses: pnpm/action-setup@v2
21+
- uses: actions/checkout@v4
22+
- uses: pnpm/action-setup@v4
2323
with:
2424
version: 10
2525
- name: Install Node
26-
uses: actions/setup-node@v3
26+
uses: actions/setup-node@v4
2727
with:
2828
node-version: 18
2929
cache: pnpm
@@ -40,11 +40,11 @@ jobs:
4040
timeout-minutes: 10
4141

4242
steps:
43-
- uses: actions/checkout@v3
44-
- uses: pnpm/action-setup@v2
43+
- uses: actions/checkout@v4
44+
- uses: pnpm/action-setup@v4
4545
with:
4646
version: 10
47-
- uses: actions/setup-node@v3
47+
- uses: actions/setup-node@v4
4848
with:
4949
node-version: 18
5050
cache: pnpm
@@ -58,7 +58,6 @@ jobs:
5858
runs-on: ubuntu-latest
5959
needs: "test"
6060
timeout-minutes: 10
61-
6261
strategy:
6362
fail-fast: false
6463
matrix:
@@ -67,19 +66,19 @@ jobs:
6766
- ember-lts-4.12
6867
- ember-lts-5.12
6968
- ember-classic
70-
# - ember-release
71-
# - ember-beta
72-
# - ember-canary
73-
# - embroider-safe
69+
- ember-release
70+
- ember-beta
71+
- ember-canary
72+
- embroider-safe
7473
# - embroider-optimized
7574

7675
steps:
77-
- uses: actions/checkout@v3
78-
- uses: pnpm/action-setup@v2
76+
- uses: actions/checkout@v4
77+
- uses: pnpm/action-setup@v4
7978
with:
8079
version: 10
8180
- name: Install Node
82-
uses: actions/setup-node@v3
81+
uses: actions/setup-node@v4
8382
with:
8483
node-version: 18
8584
cache: pnpm

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"@ember/optional-features": "^2.0.0",
6363
"@ember/string": "^4.0.0",
6464
"@ember/test-helpers": "^2.9.3",
65-
"@embroider/test-setup": "^2.1.1",
65+
"@embroider/test-setup": "^4.0.0",
6666
"@glimmer/tracking": "^1.1.2",
6767
"@types/ember-qunit": "^5.0.1",
6868
"@types/ember-resolver": "^5.0.10",
@@ -104,7 +104,7 @@
104104
"ember-sinon-qunit": "^6.0.0",
105105
"ember-source": "~4.12.0",
106106
"ember-source-channel-url": "^3.0.0",
107-
"ember-try": "^2.0.0",
107+
"ember-try": "^3.0.0",
108108
"eslint": "^8.37.0",
109109
"eslint-config-prettier": "^8.8.0",
110110
"eslint-plugin-ember": "^11.5.0",

pnpm-lock.yaml

+33-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)