Skip to content

Commit

Permalink
Fix macos latest check failures (#1041)
Browse files Browse the repository at this point in the history
* Update latest node versions

* Update latest node versions

* Update test data

* Update test data

* Update test data

* Update test data

* Update test data

* macos lts failure fix

* Update macos-13
  • Loading branch information
HarithaVattikuti authored May 22, 2024
1 parent c2ac33f commit eff380d
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 27 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/e2e-cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
node-version: [12, 14, 16]
node-version: [18, 20, 22]
steps:
- uses: actions/checkout@v4
- name: Clean global cache
Expand All @@ -42,7 +42,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
node-version: [12, 14, 16]
node-version: [18, 20, 22]
steps:
- uses: actions/checkout@v4
- name: Install pnpm
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
node-version: [14, 16]
node-version: [18, 20]
steps:
- uses: actions/checkout@v4
- name: Yarn version
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
node-version: [12, 14, 16]
node-version: [18, 20, 22]
steps:
- uses: actions/checkout@v4
- name: Update yarn
Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:
name: Test yarn subprojects
strategy:
matrix:
node-version: [12, 14, 16]
node-version: [18, 20, 22]
runs-on: ubuntu-latest

steps:
Expand All @@ -166,7 +166,7 @@ jobs:
name: Test yarn subprojects all locally managed
strategy:
matrix:
node-version: [12, 14, 16]
node-version: [18, 20, 22]
runs-on: ubuntu-latest

steps:
Expand All @@ -193,7 +193,7 @@ jobs:
name: Test yarn subprojects some locally managed
strategy:
matrix:
node-version: [12, 14, 16]
node-version: [18, 20, 22]
runs-on: ubuntu-latest

steps:
Expand All @@ -220,7 +220,7 @@ jobs:
name: Test yarn subprojects managed by git
strategy:
matrix:
node-version: [12, 14, 16]
node-version: [18, 20, 22]
runs-on: ubuntu-latest

steps:
Expand Down
28 changes: 14 additions & 14 deletions .github/workflows/versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
node-version: [10, 12, 14]
node-version: [18, 20, 22]
steps:
- uses: actions/checkout@v4
- name: Setup Node
Expand All @@ -34,7 +34,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
os: [ubuntu-latest, windows-latest, macos-13]
node-version: [lts/dubnium, lts/erbium, lts/fermium, lts/*, lts/-1]
steps:
- uses: actions/checkout@v4
Expand All @@ -43,7 +43,7 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
check-latest: true
- if: runner.os != 'Windows'
- if: runner.os != 'Windows' && runner.os != 'macOS'
name: Verify node and npm
run: |
. "$NVM_DIR/nvm.sh"
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
node-version:
[16.0.0-nightly20210420a0261d231c, 17-nightly, 18.0.0-nightly]
[20.11.0-nightly202312211a0be537da, 21-nightly, 18.0.0-nightly]
steps:
- uses: actions/checkout@v4
- name: Setup Node
Expand All @@ -103,7 +103,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
node-version: [16.0.0-rc.1, 18.0.0-rc.2, 19.0.0-rc.0]
node-version: [20.0.0-rc.1, 18.0.0-rc.2, 19.0.0-rc.0]
steps:
- uses: actions/checkout@v4
- name: Setup Node
Expand All @@ -123,7 +123,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
node-version: [10.15, 12.16.0, 14.2.0, 16.3.0]
node-version: [18.20.0, 20.10.0, 22.0.0]
steps:
- uses: actions/checkout@v4
- name: Setup Node
Expand All @@ -140,7 +140,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
node-version: [10, 12, 14]
node-version: [18, 20, 22]
steps:
- uses: actions/checkout@v4
- name: Setup Node and check latest
Expand All @@ -167,7 +167,7 @@ jobs:
with:
node-version-file: '__tests__/data/${{ matrix.node-version-file }}'
- name: Verify node
run: __tests__/verify-node.sh 14
run: __tests__/verify-node.sh 20

version-file-volta:
runs-on: ${{ matrix.os }}
Expand All @@ -182,7 +182,7 @@ jobs:
with:
node-version-file: '__tests__/data/package-volta.json'
- name: Verify node
run: __tests__/verify-node.sh 16
run: __tests__/verify-node.sh 20

version-file-volta-extends:
runs-on: ${{ matrix.os }}
Expand All @@ -197,15 +197,15 @@ jobs:
with:
node-version-file: '__tests__/data/package-volta-extends.json'
- name: Verify node
run: __tests__/verify-node.sh 16
run: __tests__/verify-node.sh 20

node-dist:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
node-version: [11, 13]
node-version: [17, 19]
steps:
- uses: actions/checkout@v4
- name: Setup Node from dist
Expand All @@ -221,7 +221,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
os: [ubuntu-latest, windows-latest, macos-13]
steps:
- uses: actions/checkout@v4
# test old versions which didn't have npm and layout different
Expand All @@ -237,10 +237,10 @@ jobs:
runs-on: windows-latest
steps:
- uses: actions/checkout@v4
- name: Setup node 14 x86 from dist
- name: Setup node 20 x86 from dist
uses: ./
with:
node-version: '14'
node-version: '20'
architecture: 'x86'
- name: Verify node
run: __tests__/verify-arch.sh "ia32"
Expand Down
2 changes: 1 addition & 1 deletion __tests__/data/.nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v14
v20
2 changes: 1 addition & 1 deletion __tests__/data/.tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nodejs 14.0.0
nodejs 20.0.0
2 changes: 1 addition & 1 deletion __tests__/data/.tool-versions-node
Original file line number Diff line number Diff line change
@@ -1 +1 @@
node 14.0.0
node 20.0.0
2 changes: 1 addition & 1 deletion __tests__/data/package-volta.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"node": "^14.0.0"
},
"volta": {
"node": "16.0.0"
"node": "20.0.0"
}
}
2 changes: 1 addition & 1 deletion __tests__/data/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"engines": {
"node": "^14.0.0"
"node": "^20.0.0"
}
}

0 comments on commit eff380d

Please sign in to comment.