Skip to content

Commit f634129

Browse files
committed
fix: upgrade setup-java to v4 with zulu distribution to fix JAVA_HOME on macOS runners
setup-java@v1 fails to correctly set JAVA_HOME on newer macOS runners. Temurin doesn't support Java 8 on macOS, so use zulu distribution instead. Also upgrade checkout@v2→v4 and setup-node@v2→v4. Change-Id: Ibb3997e6df9cb3c744a1a35fbd90160b276f80b1 Co-developed-by: Claude <noreply@anthropic.com>
1 parent a698c00 commit f634129

2 files changed

Lines changed: 20 additions & 15 deletions

File tree

.github/workflows/ci_node16.yaml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ jobs:
1919
macos-ci:
2020
runs-on: macos-latest
2121
steps:
22-
- uses: actions/checkout@v2
23-
- uses: actions/setup-node@v2
22+
- uses: actions/checkout@v4
23+
- uses: actions/setup-node@v4
2424
with:
2525
node-version: 16
2626
registry-url: https://registry.npmjs.org/
@@ -29,9 +29,10 @@ jobs:
2929
with:
3030
go-version: 1.18
3131
- name: Set up Java
32-
uses: actions/setup-java@v1
32+
uses: actions/setup-java@v4
3333
with:
3434
java-version: 8
35+
distribution: zulu
3536
- name: install s
3637
run: |
3738
npm i @serverless-devs/s -g
@@ -58,8 +59,8 @@ jobs:
5859
windows-ci:
5960
runs-on: windows-latest
6061
steps:
61-
- uses: actions/checkout@v2
62-
- uses: actions/setup-node@v2
62+
- uses: actions/checkout@v4
63+
- uses: actions/setup-node@v4
6364
with:
6465
node-version: 16
6566
registry-url: https://registry.npmjs.org/
@@ -71,9 +72,10 @@ jobs:
7172
with:
7273
go-version: 1.18
7374
- name: Set up Java
74-
uses: actions/setup-java@v1
75+
uses: actions/setup-java@v4
7576
with:
7677
java-version: 8
78+
distribution: zulu
7779
- name: install s
7880
run: |
7981
npm i @serverless-devs/s -g
@@ -102,8 +104,8 @@ jobs:
102104
linux-ci:
103105
runs-on: ubuntu-latest
104106
steps:
105-
- uses: actions/checkout@v2
106-
- uses: actions/setup-node@v2
107+
- uses: actions/checkout@v4
108+
- uses: actions/setup-node@v4
107109
with:
108110
node-version: 16
109111
registry-url: https://registry.npmjs.org/
@@ -112,9 +114,10 @@ jobs:
112114
with:
113115
go-version: 1.18
114116
- name: Set up Java
115-
uses: actions/setup-java@v1
117+
uses: actions/setup-java@v4
116118
with:
117119
java-version: 8
120+
distribution: zulu
118121
- name: install s
119122
run: |
120123
npm i @serverless-devs/s -g

.github/workflows/ci_with_docker_linux.yaml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
docker-ci-standard:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v4
1616
- uses: docker/setup-buildx-action@v2
17-
- uses: actions/setup-node@v2
17+
- uses: actions/setup-node@v4
1818
with:
1919
node-version: 16
2020
registry-url: https://registry.npmjs.org/
@@ -23,9 +23,10 @@ jobs:
2323
with:
2424
go-version: 1.18
2525
- name: Set up Java
26-
uses: actions/setup-java@v1
26+
uses: actions/setup-java@v4
2727
with:
2828
java-version: 8
29+
distribution: zulu
2930
- name: Install dependencies
3031
run: |
3132
sudo apt-get update
@@ -68,9 +69,9 @@ jobs:
6869
docker-ci-custom:
6970
runs-on: ubuntu-latest
7071
steps:
71-
- uses: actions/checkout@v2
72+
- uses: actions/checkout@v4
7273
- uses: docker/setup-buildx-action@v2
73-
- uses: actions/setup-node@v2
74+
- uses: actions/setup-node@v4
7475
with:
7576
node-version: 16
7677
registry-url: https://registry.npmjs.org/
@@ -79,9 +80,10 @@ jobs:
7980
with:
8081
go-version: 1.18
8182
- name: Set up Java
82-
uses: actions/setup-java@v1
83+
uses: actions/setup-java@v4
8384
with:
8485
java-version: 8
86+
distribution: zulu
8587
- name: Install dependencies
8688
run: |
8789
sudo apt-get update

0 commit comments

Comments
 (0)