Skip to content

Commit 40a62a4

Browse files
mixonicmixonic
authored
Yarn upgrade, fix CI compat with Ember 4 (#135)
1 parent 515ad2f commit 40a62a4

5 files changed

Lines changed: 896 additions & 789 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 140 additions & 142 deletions
Original file line numberDiff line numberDiff line change
@@ -7,46 +7,45 @@ on:
77
pull_request:
88

99
env:
10-
NODE_VERSION: '12.x'
10+
NODE_VERSION: '14.x'
1111

1212
jobs:
1313
lint:
1414
name: Lint
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v2
18-
with:
19-
fetch-depth: 1
20-
21-
- uses: actions/setup-node@v2-beta
22-
with:
23-
node-version: '${{ env.NODE_VERSION }}'
24-
25-
- name: Get package manager's global cache path
26-
id: global-cache-dir-path
27-
run: echo "::set-output name=dir::$(yarn cache dir)"
28-
29-
- name: Cache package manager's global cache and node_modules
30-
id: cache-dependencies
31-
uses: actions/cache@v2
32-
with:
33-
path: |
34-
${{ steps.global-cache-dir-path.outputs.dir }}
35-
node_modules
36-
key: ${{ runner.os }}-${{ matrix.node-version }}-${{
37-
hashFiles('**/yarn.lock'
38-
) }}
39-
restore-keys: |
40-
${{ runner.os }}-${{ matrix.node-version }}-
41-
42-
- name: Install Dependencies
43-
run: yarn install --frozen-lockfile
44-
if: |
45-
steps.cache-dependencies.outputs.cache-hit != 'true'
46-
47-
- name: Lint
48-
run: yarn lint
49-
17+
- uses: actions/checkout@v2
18+
with:
19+
fetch-depth: 1
20+
21+
- uses: actions/setup-node@v2-beta
22+
with:
23+
node-version: '${{ env.NODE_VERSION }}'
24+
25+
- name: Get package manager's global cache path
26+
id: global-cache-dir-path
27+
run: echo "::set-output name=dir::$(yarn cache dir)"
28+
29+
- name: Cache package manager's global cache and node_modules
30+
id: cache-dependencies
31+
uses: actions/cache@v2
32+
with:
33+
path: |
34+
${{ steps.global-cache-dir-path.outputs.dir }}
35+
node_modules
36+
key: ${{ runner.os }}-${{ matrix.node-version }}-${{
37+
hashFiles('**/yarn.lock'
38+
) }}
39+
restore-keys: |
40+
${{ runner.os }}-${{ matrix.node-version }}-
41+
42+
- name: Install Dependencies
43+
run: yarn install --frozen-lockfile
44+
if: |
45+
steps.cache-dependencies.outputs.cache-hit != 'true'
46+
47+
- name: Lint
48+
run: yarn lint
5049

5150
test:
5251
name: Tests
@@ -59,39 +58,38 @@ jobs:
5958
browser: [chrome]
6059

6160
steps:
62-
- uses: actions/checkout@v2
63-
with:
64-
fetch-depth: 1
65-
66-
- uses: actions/setup-node@v2-beta
67-
with:
68-
node-version: '${{ env.NODE_VERSION }}'
69-
70-
- name: Get package manager's global cache path
71-
id: global-cache-dir-path
72-
run: echo "::set-output name=dir::$(yarn cache dir)"
73-
74-
- name: Cache package manager's global cache and node_modules
75-
id: cache-dependencies
76-
uses: actions/cache@v2
77-
with:
78-
path: |
79-
${{ steps.global-cache-dir-path.outputs.dir }}
80-
node_modules
81-
key: ${{ runner.os }}-${{ matrix.node-version }}-${{
82-
hashFiles('**/yarn.lock'
83-
) }}
84-
restore-keys: |
85-
${{ runner.os }}-${{ matrix.node-version }}-
86-
87-
- name: Install Dependencies
88-
run: yarn install --frozen-lockfile
89-
if: |
90-
steps.cache-dependencies.outputs.cache-hit != 'true'
91-
92-
- name: Test
93-
run: yarn test:ember --launch ${{ matrix.browser }}
94-
61+
- uses: actions/checkout@v2
62+
with:
63+
fetch-depth: 1
64+
65+
- uses: actions/setup-node@v2-beta
66+
with:
67+
node-version: '${{ env.NODE_VERSION }}'
68+
69+
- name: Get package manager's global cache path
70+
id: global-cache-dir-path
71+
run: echo "::set-output name=dir::$(yarn cache dir)"
72+
73+
- name: Cache package manager's global cache and node_modules
74+
id: cache-dependencies
75+
uses: actions/cache@v2
76+
with:
77+
path: |
78+
${{ steps.global-cache-dir-path.outputs.dir }}
79+
node_modules
80+
key: ${{ runner.os }}-${{ matrix.node-version }}-${{
81+
hashFiles('**/yarn.lock'
82+
) }}
83+
restore-keys: |
84+
${{ runner.os }}-${{ matrix.node-version }}-
85+
86+
- name: Install Dependencies
87+
run: yarn install --frozen-lockfile
88+
if: |
89+
steps.cache-dependencies.outputs.cache-hit != 'true'
90+
91+
- name: Test
92+
run: yarn test:ember --launch ${{ matrix.browser }}
9593

9694
floating-dependencies:
9795
name: Floating Dependencies
@@ -104,35 +102,34 @@ jobs:
104102
browser: [chrome]
105103

106104
steps:
107-
- uses: actions/checkout@v2
108-
with:
109-
fetch-depth: 1
110-
111-
- uses: actions/setup-node@v2-beta
112-
with:
113-
node-version: '${{ env.NODE_VERSION }}'
114-
115-
- name: Get package manager's global cache path
116-
id: global-cache-dir-path
117-
run: echo "::set-output name=dir::$(yarn cache dir)"
118-
119-
- name: Cache package manager's global cache and node_modules
120-
id: cache-dependencies
121-
uses: actions/cache@v2
122-
with:
123-
path: |
124-
${{ steps.global-cache-dir-path.outputs.dir }}
125-
node_modules
126-
key: ${{ runner.os }}-${{ matrix.node-version }}-floating-deps
127-
restore-keys: |
128-
${{ runner.os }}-${{ matrix.node-version }}-
129-
130-
- name: Install Dependencies
131-
run: yarn install --no-lockfile --non-interactive
132-
133-
- name: Test
134-
run: yarn test:ember --launch ${{ matrix.browser }}
135-
105+
- uses: actions/checkout@v2
106+
with:
107+
fetch-depth: 1
108+
109+
- uses: actions/setup-node@v2-beta
110+
with:
111+
node-version: '${{ env.NODE_VERSION }}'
112+
113+
- name: Get package manager's global cache path
114+
id: global-cache-dir-path
115+
run: echo "::set-output name=dir::$(yarn cache dir)"
116+
117+
- name: Cache package manager's global cache and node_modules
118+
id: cache-dependencies
119+
uses: actions/cache@v2
120+
with:
121+
path: |
122+
${{ steps.global-cache-dir-path.outputs.dir }}
123+
node_modules
124+
key: ${{ runner.os }}-${{ matrix.node-version }}-floating-deps
125+
restore-keys: |
126+
${{ runner.os }}-${{ matrix.node-version }}-
127+
128+
- name: Install Dependencies
129+
run: yarn install --no-lockfile --non-interactive
130+
131+
- name: Test
132+
run: yarn test:ember --launch ${{ matrix.browser }}
136133

137134
try-scenarios:
138135
name: Tests - ${{ matrix.ember-try-scenario }}
@@ -143,55 +140,56 @@ jobs:
143140
strategy:
144141
fail-fast: true
145142
matrix:
146-
ember-try-scenario: [
147-
ember-lts-2.12,
148-
ember-lts-2.18,
149-
ember-lts-3.16,
150-
ember-lts-3.20,
151-
ember-lts-3.24,
152-
ember-release,
153-
ember-beta,
154-
ember-canary,
155-
ember-release-with-jquery,
156-
ember-release-classic
157-
]
143+
ember-try-scenario:
144+
[
145+
ember-lts-2.12,
146+
ember-lts-2.18,
147+
ember-lts-3.16,
148+
ember-lts-3.20,
149+
ember-lts-3.24,
150+
ember-release,
151+
ember-beta,
152+
ember-canary,
153+
ember-3.28-with-jquery,
154+
ember-3.28-classic,
155+
]
158156
allow-failure: [false]
159157
include:
160158
- ember-try-scenario: ember-canary
161159
allow-failure: true
162160

163161
steps:
164-
- uses: actions/checkout@v2
165-
with:
166-
fetch-depth: 1
167-
168-
- uses: actions/setup-node@v2-beta
169-
with:
170-
node-version: '${{ env.NODE_VERSION }}'
171-
172-
- name: Get package manager's global cache path
173-
id: global-cache-dir-path
174-
run: echo "::set-output name=dir::$(yarn cache dir)"
175-
176-
- name: Cache package manager's global cache and node_modules
177-
id: cache-dependencies
178-
uses: actions/cache@v2
179-
with:
180-
path: |
181-
${{ steps.global-cache-dir-path.outputs.dir }}
182-
node_modules
183-
key: ${{ runner.os }}-${{ matrix.node-version }}-${{
184-
hashFiles('**/yarn.lock'
185-
) }}
186-
restore-keys: |
187-
${{ runner.os }}-${{ matrix.node-version }}-
188-
189-
- name: Install Dependencies
190-
run: yarn install --frozen-lockfile
191-
if: |
192-
steps.cache-dependencies.outputs.cache-hit != 'true'
193-
194-
- name: Test
195-
env:
196-
EMBER_TRY_SCENARIO: ${{ matrix.ember-try-scenario }}
197-
run: node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO
162+
- uses: actions/checkout@v2
163+
with:
164+
fetch-depth: 1
165+
166+
- uses: actions/setup-node@v2-beta
167+
with:
168+
node-version: '${{ env.NODE_VERSION }}'
169+
170+
- name: Get package manager's global cache path
171+
id: global-cache-dir-path
172+
run: echo "::set-output name=dir::$(yarn cache dir)"
173+
174+
- name: Cache package manager's global cache and node_modules
175+
id: cache-dependencies
176+
uses: actions/cache@v2
177+
with:
178+
path: |
179+
${{ steps.global-cache-dir-path.outputs.dir }}
180+
node_modules
181+
key: ${{ runner.os }}-${{ matrix.node-version }}-${{
182+
hashFiles('**/yarn.lock'
183+
) }}
184+
restore-keys: |
185+
${{ runner.os }}-${{ matrix.node-version }}-
186+
187+
- name: Install Dependencies
188+
run: yarn install --frozen-lockfile
189+
if: |
190+
steps.cache-dependencies.outputs.cache-hit != 'true'
191+
192+
- name: Test
193+
env:
194+
EMBER_TRY_SCENARIO: ${{ matrix.ember-try-scenario }}
195+
run: node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

‎config/ember-try.js‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,21 @@ module.exports = async function () {
1111
name: 'ember-lts-2.12',
1212
npm: {
1313
devDependencies: {
14+
'@ember/test-helpers': '^1.7.3',
15+
'ember-qunit': '^4.6.0',
1416
'ember-source': '~2.12.0',
17+
qunit: null,
1518
},
1619
},
1720
},
1821
{
1922
name: 'ember-lts-2.18',
2023
npm: {
2124
devDependencies: {
25+
'@ember/test-helpers': '^1.7.3',
26+
'ember-qunit': '^4.6.0',
2227
'ember-source': '~2.18.0',
28+
qunit: null,
2329
},
2430
},
2531
},
@@ -72,21 +78,21 @@ module.exports = async function () {
7278
},
7379
},
7480
{
75-
name: 'ember-release-with-jquery',
81+
name: 'ember-3.28-with-jquery',
7682
env: {
7783
EMBER_OPTIONAL_FEATURES: JSON.stringify({
7884
'jquery-integration': true,
7985
}),
8086
},
8187
npm: {
8288
devDependencies: {
83-
'ember-source': emberReleaseVersion,
89+
'ember-source': '~3.28.0',
8490
'@ember/jquery': '^2.0.0',
8591
},
8692
},
8793
},
8894
{
89-
name: 'ember-release-classic',
95+
name: 'ember-3.28-classic',
9096
env: {
9197
EMBER_OPTIONAL_FEATURES: JSON.stringify({
9298
'application-template-wrapper': true,
@@ -96,7 +102,7 @@ module.exports = async function () {
96102
},
97103
npm: {
98104
devDependencies: {
99-
'ember-source': emberReleaseVersion,
105+
'ember-source': '~3.28.0',
100106
},
101107
ember: {
102108
edition: 'classic',

0 commit comments

Comments
 (0)