Skip to content

Commit fa51364

Browse files
schuenadelschuenadel
committed
Merge remote-tracking branch 'git@github.com-actions/setup-java.git/main' into include-buildSrc-in-cache-key
2 parents ca584e7 + 055250a commit fa51364

35 files changed

Lines changed: 8903 additions & 1790 deletions

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ jobs:
1919
matrix:
2020
os: [ubuntu-latest, windows-latest, macos-latest]
2121
steps:
22-
- uses: actions/checkout@v2
23-
- name: Setup Node.JS 12
24-
uses: actions/setup-node@v2
22+
- uses: actions/checkout@v3
23+
- name: Setup Node.JS 16
24+
uses: actions/setup-node@v3
2525
with:
26-
node-version: 12.x
26+
node-version: 16.x
2727
cache: npm
2828
- run: npm ci
2929
- run: npm run build

‎.github/workflows/check-dist.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@ jobs:
2121
runs-on: ubuntu-latest
2222

2323
steps:
24-
- uses: actions/checkout@v2
24+
- uses: actions/checkout@v3
2525

26-
- name: Set Node.js 12.x
27-
uses: actions/setup-node@v1
26+
- name: Set Node.js 16.x
27+
uses: actions/setup-node@v3
2828
with:
29-
node-version: 12.x
29+
node-version: 16.x
30+
cache: npm
3031

3132
- name: Install dependencies
3233
run: npm ci
@@ -44,7 +45,7 @@ jobs:
4445
id: diff
4546

4647
# If index.js was different than expected, upload the expected version as an artifact
47-
- uses: actions/upload-artifact@v2
48+
- uses: actions/upload-artifact@v3
4849
if: ${{ failure() && steps.diff.conclusion == 'failure' }}
4950
with:
5051
name: dist

‎.github/workflows/e2e-cache.yml‎

Lines changed: 100 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
os: [macos-latest, windows-latest, ubuntu-latest]
2424
steps:
2525
- name: Checkout
26-
uses: actions/checkout@v2
26+
uses: actions/checkout@v3
2727
- name: Run setup-java with the cache for gradle
2828
uses: ./
2929
id: setup-java
@@ -49,7 +49,7 @@ jobs:
4949
needs: gradle-save
5050
steps:
5151
- name: Checkout
52-
uses: actions/checkout@v2
52+
uses: actions/checkout@v3
5353
- name: Run setup-java with the cache for gradle
5454
uses: ./
5555
id: setup-java
@@ -72,7 +72,7 @@ jobs:
7272
os: [macos-latest, windows-latest, ubuntu-latest]
7373
steps:
7474
- name: Checkout
75-
uses: actions/checkout@v2
75+
uses: actions/checkout@v3
7676
- name: Run setup-java with the cache for maven
7777
uses: ./
7878
id: setup-java
@@ -96,7 +96,7 @@ jobs:
9696
needs: maven-save
9797
steps:
9898
- name: Checkout
99-
uses: actions/checkout@v2
99+
uses: actions/checkout@v3
100100
- name: Run setup-java with the cache for maven
101101
uses: ./
102102
id: setup-java
@@ -111,3 +111,99 @@ jobs:
111111
exit 1
112112
fi
113113
ls ~/.m2/repository
114+
sbt-save:
115+
runs-on: ${{ matrix.os }}
116+
defaults:
117+
run:
118+
shell: bash
119+
working-directory: __tests__/cache/sbt
120+
strategy:
121+
fail-fast: false
122+
matrix:
123+
os: [macos-latest, windows-latest, ubuntu-latest]
124+
steps:
125+
- name: Checkout
126+
uses: actions/checkout@v3
127+
- name: Run setup-java with the cache for sbt
128+
uses: ./
129+
id: setup-java
130+
with:
131+
distribution: 'adopt'
132+
java-version: '11'
133+
cache: sbt
134+
- name: Create files to cache
135+
run: sbt update
136+
137+
- name: Check files to cache on macos-latest
138+
if: matrix.os == 'macos-latest'
139+
run: |
140+
if [ ! -d ~/Library/Caches/Coursier ]; then
141+
echo "::error::The ~/Library/Caches/Coursier directory does not exist unexpectedly"
142+
exit 1
143+
fi
144+
145+
- name: Check files to cache on windows-latest
146+
if: matrix.os == 'windows-latest'
147+
run: |
148+
if [ ! -d ~/AppData/Local/Coursier/Cache ]; then
149+
echo "::error::The ~/AppData/Local/Coursier/Cache directory does not exist unexpectedly"
150+
exit 1
151+
fi
152+
153+
154+
- name: Check files to cache on ubuntu-latest
155+
if: matrix.os == 'ubuntu-latest'
156+
run: |
157+
if [ ! -d ~/.cache/coursier ]; then
158+
echo "::error::The ~/.cache/coursier directory does not exist unexpectedly"
159+
exit 1
160+
fi
161+
162+
sbt-restore:
163+
runs-on: ${{ matrix.os }}
164+
defaults:
165+
run:
166+
shell: bash
167+
working-directory: __tests__/cache/sbt
168+
strategy:
169+
fail-fast: false
170+
matrix:
171+
os: [macos-latest, windows-latest, ubuntu-latest]
172+
needs: sbt-save
173+
steps:
174+
- name: Checkout
175+
uses: actions/checkout@v3
176+
- name: Run setup-java with the cache for sbt
177+
uses: ./
178+
id: setup-java
179+
with:
180+
distribution: 'adopt'
181+
java-version: '11'
182+
cache: sbt
183+
184+
- name: Confirm that ~/Library/Caches/Coursier directory has been made
185+
if: matrix.os == 'macos-latest'
186+
run: |
187+
if [ ! -d ~/Library/Caches/Coursier ]; then
188+
echo "::error::The ~/Library/Caches/Coursier directory does not exist unexpectedly"
189+
exit 1
190+
fi
191+
ls ~/Library/Caches/Coursier
192+
193+
- name: Confirm that ~/AppData/Local/Coursier/Cache directory has been made
194+
if: matrix.os == 'windows-latest'
195+
run: |
196+
if [ ! -d ~/AppData/Local/Coursier/Cache ]; then
197+
echo "::error::The ~/AppData/Local/Coursier/Cache directory does not exist unexpectedly"
198+
exit 1
199+
fi
200+
ls ~/AppData/Local/Coursier/Cache
201+
202+
- name: Confirm that ~/.cache/coursier directory has been made
203+
if: matrix.os == 'ubuntu-latest'
204+
run: |
205+
if [ ! -d ~/.cache/coursier ]; then
206+
echo "::error::The ~/.cache/coursier directory does not exist unexpectedly"
207+
exit 1
208+
fi
209+
ls ~/.cache/coursier

‎.github/workflows/e2e-local-file.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
os: [macos-latest, windows-latest, ubuntu-latest]
2121
steps:
2222
- name: Checkout
23-
uses: actions/checkout@v2
23+
uses: actions/checkout@v3
2424
- name: Download Adopt OpenJDK file
2525
run: |
2626
if ($IsLinux) {
@@ -57,7 +57,7 @@ jobs:
5757
os: [macos-latest, windows-latest, ubuntu-latest]
5858
steps:
5959
- name: Checkout
60-
uses: actions/checkout@v2
60+
uses: actions/checkout@v3
6161
- name: Download Zulu OpenJDK file
6262
run: |
6363
if ($IsLinux) {
@@ -94,7 +94,7 @@ jobs:
9494
os: [macos-latest, windows-latest, ubuntu-latest]
9595
steps:
9696
- name: Checkout
97-
uses: actions/checkout@v2
97+
uses: actions/checkout@v3
9898
- name: Download Eclipse Temurin file
9999
run: |
100100
if ($IsLinux) {

‎.github/workflows/e2e-publishing.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
os: [macos-latest, windows-latest, ubuntu-latest]
2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@v2
27+
uses: actions/checkout@v3
2828
- name: setup-java
2929
uses: ./
3030
id: setup-java
@@ -59,7 +59,7 @@ jobs:
5959
os: [macos-latest, windows-latest, ubuntu-latest]
6060
steps:
6161
- name: Checkout
62-
uses: actions/checkout@v2
62+
uses: actions/checkout@v3
6363
- name: Create fake settings.xml
6464
run: |
6565
$xmlDirectory = Join-Path $HOME ".m2"
@@ -95,7 +95,7 @@ jobs:
9595
os: [macos-latest, windows-latest, ubuntu-latest]
9696
steps:
9797
- name: Checkout
98-
uses: actions/checkout@v2
98+
uses: actions/checkout@v3
9999
- name: Create fake settings.xml
100100
run: |
101101
$xmlDirectory = Join-Path $HOME ".m2"
@@ -132,7 +132,7 @@ jobs:
132132
os: [macos-latest, windows-latest, ubuntu-latest]
133133
steps:
134134
- name: Checkout
135-
uses: actions/checkout@v2
135+
uses: actions/checkout@v3
136136
- name: setup-java
137137
uses: ./
138138
id: setup-java

‎.github/workflows/e2e-versions.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
version: 8
2828
steps:
2929
- name: Checkout
30-
uses: actions/checkout@v2
30+
uses: actions/checkout@v3
3131
- name: setup-java
3232
uses: ./
3333
id: setup-java
@@ -53,7 +53,7 @@ jobs:
5353
- '16.0.2+7'
5454
steps:
5555
- name: Checkout
56-
uses: actions/checkout@v2
56+
uses: actions/checkout@v3
5757
- name: setup-java
5858
uses: ./
5959
id: setup-java
@@ -75,7 +75,7 @@ jobs:
7575
distribution: ['temurin', 'zulu', 'liberica']
7676
steps:
7777
- name: Checkout
78-
uses: actions/checkout@v2
78+
uses: actions/checkout@v3
7979
- name: setup-java
8080
uses: ./
8181
id: setup-java
@@ -98,7 +98,7 @@ jobs:
9898
version: ['17-ea', '15.0.0-ea.14']
9999
steps:
100100
- name: Checkout
101-
uses: actions/checkout@v2
101+
uses: actions/checkout@v3
102102
- name: setup-java
103103
uses: ./
104104
id: setup-java
@@ -120,7 +120,7 @@ jobs:
120120
version: ['17-ea']
121121
steps:
122122
- name: Checkout
123-
uses: actions/checkout@v2
123+
uses: actions/checkout@v3
124124
- name: setup-java
125125
uses: ./
126126
id: setup-java
@@ -165,7 +165,7 @@ jobs:
165165
java-package: 'jre'
166166
steps:
167167
- name: Checkout
168-
uses: actions/checkout@v2
168+
uses: actions/checkout@v3
169169
- name: setup-java
170170
uses: ./
171171
id: setup-java
@@ -191,7 +191,7 @@ jobs:
191191
version: ['11']
192192
steps:
193193
- name: Checkout
194-
uses: actions/checkout@v2
194+
uses: actions/checkout@v3
195195
- name: setup-java
196196
uses: ./
197197
id: setup-java

‎.github/workflows/licensed.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ jobs:
1414
runs-on: ubuntu-latest
1515
name: Check licenses
1616
steps:
17-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v3
1818
- run: npm ci
1919
- name: Install licensed
2020
run: |
2121
cd $RUNNER_TEMP
22-
curl -Lfs -o licensed.tar.gz https://github.com/github/licensed/releases/download/3.3.1/licensed-3.3.1-linux-x64.tar.gz
22+
curl -Lfs -o licensed.tar.gz https://github.com/github/licensed/releases/download/3.4.4/licensed-3.4.4-linux-x64.tar.gz
2323
sudo tar -xzf licensed.tar.gz
2424
sudo mv licensed /usr/local/bin/licensed
2525
- run: licensed status

‎.licenses/npm/@actions/cache.dep.yml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.licenses/npm/@azure/core-asynciterator-polyfill.dep.yml‎

Lines changed: 20 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.licenses/npm/@azure/core-http.dep.yml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)