Skip to content

Commit 257f5d7

Browse files
authored
Merge pull request #1243 from ember-cli/fix-ci
Fix CI
2 parents 1042e15 + 4e4521b commit 257f5d7

File tree

12 files changed

+1184
-833
lines changed

12 files changed

+1184
-833
lines changed

.github/workflows/ci.yml

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
- uses: actions/setup-node@v3
2121
with:
2222
node-version: 14
23+
cache: 'npm'
2324

2425
- run: npm ci
2526
- run: npm run lint
@@ -28,22 +29,22 @@ jobs:
2829
needs: lint
2930

3031
strategy:
32+
fail-fast: false
3133
matrix:
3234
os:
33-
- ubuntu-latest
34-
- macos-latest
35+
- ubuntu-latest
36+
- macos-latest
3537
node:
36-
- 14
37-
# - '*'
38+
- 14
39+
- 16
40+
- 18
41+
- 20
3842
test-command:
39-
- test:bin
40-
- test:fast
43+
- test:bin
44+
- test:fast
4145
exclude:
42-
# - os: macos-latest
43-
# node: '*'
44-
- os: macos-latest
45-
node: 14
46-
test-command: test:fast
46+
- os: macos-latest
47+
test-command: test:fast
4748

4849
runs-on: ${{ matrix.os }}
4950

@@ -52,6 +53,7 @@ jobs:
5253
- uses: actions/setup-node@v3
5354
with:
5455
node-version: ${{ matrix.node }}
56+
cache: 'npm'
5557

5658
# for test cache hits
5759
- run: npm i -g [email protected]
@@ -73,12 +75,13 @@ jobs:
7375
- uses: actions/checkout@v3
7476
with:
7577
ref: ${{ github.head_ref }}
76-
token: ${{ secrets.GitHubToken }}
78+
7779
- uses: actions/setup-node@v3
7880
with:
7981
node-version: 14
82+
cache: 'npm'
8083

81-
- uses: kellyselden/ember-cli-update-action@v3
84+
- uses: kellyselden/ember-cli-update-action@v5
8285
with:
8386
autofix_command: npm run lint -- --fix
8487
ignore_to: true

appveyor.yml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
environment:
22
matrix:
3-
# node 14.5 has a regression
4-
# npm ERR! cb.apply is not a function
5-
# - nodejs_version: "14"
6-
- nodejs_version: "14.4"
3+
- nodejs_version: "14"
74
DEBUG: "ember-cli-update,boilerplate-update,git-diff-apply"
85

96
branches:
@@ -19,15 +16,6 @@ install:
1916
- ps: Install-Product node $env:nodejs_version
2017
# for test cache hits
2118
- npm i -g [email protected]
22-
- ps: >-
23-
[Environment]::SetEnvironmentVariable("NODE_LTS", "true", "User")
24-
- RefreshEnv
25-
- where npx
26-
# don't accidentally use the global npx
27-
- ps: rm "C:\Program Files\nodejs\npx*"
28-
- ps: rm C:\Users\appveyor\AppData\Roaming\npm\npx*
29-
# test that we can't find it
30-
- ps: if (gcm npx) { exit }
3119
- npm ci
3220

3321
# Post-install test scripts.
@@ -38,7 +26,7 @@ test_script:
3826

3927
# http://help.appveyor.com/discussions/questions/1310-delete-cache
4028
cache:
41-
- node_modules -> package.json
29+
- node_modules -> package-lock.json
4230

4331
# Don't actually build.
4432
build: off

0 commit comments

Comments
 (0)