Skip to content

Commit eafe4e7

Browse files
authored
Merge pull request #168 from mixonic/mixonic/add-ember-4-12
Add Ember 4.12 to CI
2 parents a8f256b + 9134edd commit eafe4e7

File tree

5 files changed

+26
-4
lines changed

5 files changed

+26
-4
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,13 +150,11 @@ jobs:
150150
ember-lts-3.28,
151151
ember-lts-4.4,
152152
ember-lts-4.8,
153+
ember-lts-4.12,
153154
ember-3.28-with-jquery,
154155
ember-3.28-classic,
155156
]
156157
allow-failure: [false]
157-
include:
158-
- ember-try-scenario: ember-canary
159-
allow-failure: true
160158

161159
steps:
162160
- uses: actions/checkout@v2

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ addressing a single deprecation at a time, and prevents backsliding
2525

2626
2.x
2727

28-
- Ember.js 2.12 until at least 4.8
28+
- Ember.js 2.12 until at least 4.12
2929
- Ember CLI 3.16 or above
3030
- Node.js 12 and 14 or above
3131

config/ember-try.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,22 @@ module.exports = async function () {
7878
},
7979
},
8080
},
81+
{
82+
name: 'ember-lts-4.12',
83+
npm: {
84+
devDependencies: {
85+
'ember-source': '~4.12.0',
86+
},
87+
},
88+
},
89+
{
90+
name: 'ember-lts-5.3',
91+
npm: {
92+
devDependencies: {
93+
'ember-source': '~5.3.0',
94+
},
95+
},
96+
},
8197
{
8298
name: 'ember-release',
8399
npm: {

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"test:ember-compatibility": "ember try:each"
2828
},
2929
"dependencies": {
30+
"@ember/string":"^3.0.0",
3031
"broccoli-funnel": "^3.0.3",
3132
"broccoli-merge-trees": "^4.2.0",
3233
"broccoli-plugin": "^4.0.5"

yarn.lock

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,6 +1098,13 @@
10981098
mkdirp "^1.0.4"
10991099
silent-error "^1.1.1"
11001100

1101+
"@ember/string@^3.0.0":
1102+
version "3.1.1"
1103+
resolved "https://registry.yarnpkg.com/@ember/string/-/string-3.1.1.tgz#0a5ac0d1e4925259e41d5c8d55ef616117d47ff0"
1104+
integrity sha512-UbXJ+k3QOrYN4SRPHgXCqYIJ+yWWUg1+vr0H4DhdQPTy8LJfyqwZ2tc5uqpSSnEXE+/1KopHBE5J8GDagAg5cg==
1105+
dependencies:
1106+
ember-cli-babel "^7.26.6"
1107+
11011108
11021109
version "2.2.9"
11031110
resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-2.2.9.tgz#68cceb50ad5b8adedad5d8bf73b39ff71a07f4a6"

0 commit comments

Comments
 (0)