Skip to content

Commit 3696821

Browse files
thugrock7thugrock7
authored
feat: using latest ubuntu runners (#420)
* upgrading ubuntu runner to latest * updating to use java 11 adoption
1 parent e076234 commit 3696821

File tree

5 files changed

+56
-15
lines changed

5 files changed

+56
-15
lines changed

‎.github/workflows/build-springboot-smoke-dist.yml

+2
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,5 @@ jobs:
4242
./gradlew jib -PtargetJDK=11 -Djib.httpTimeout=120000 -Djib.console=plain --stacktrace -Ptag=$TAG
4343
./gradlew jib -PtargetJDK=15 -Djib.httpTimeout=120000 -Djib.console=plain --stacktrace -Ptag=$TAG
4444
working-directory: smoke-tests/springboot
45+
env:
46+
JVM_OPTS: -Xmx1g --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED

‎.github/workflows/build-test-matrix.yaml

+5-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@v2
1616
- name: Set up JDK 11 for running Gradle
17-
uses: actions/setup-java@v1
17+
uses: actions/setup-java@v2
1818
with:
19+
distribution: adopt
1920
java-version: 11
2021

2122
- name: Cache gradle dependencies
@@ -34,4 +35,6 @@ jobs:
3435
TAG="$(date '+%Y%m%d').$GITHUB_RUN_ID"
3536
echo "Using extra tag $TAG"
3637
./gradlew buildMatrix pushMatrix -PextraTag=$TAG
37-
working-directory: smoke-tests/matrix
38+
working-directory: smoke-tests/matrix
39+
env:
40+
JVM_OPTS: -Xmx1g --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED

‎.github/workflows/build.yaml

+17-5
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010

1111
jobs:
1212
build:
13-
runs-on: ubuntu-20.04
13+
runs-on: ubuntu-latest
1414
steps:
1515
# Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
1616
- name: Check out code
@@ -21,6 +21,12 @@ jobs:
2121
fetch-depth: 0
2222
submodules: true
2323

24+
- name: Set up JDK 11
25+
uses: actions/setup-java@v2
26+
with:
27+
distribution: adopt
28+
java-version: 11
29+
2430
- name: create checksum file
2531
uses: hypertrace/github-actions/checksum@main
2632

@@ -37,10 +43,10 @@ jobs:
3743
- name: build
3844
run: make build
3945
env:
40-
JVM_OPTS: -Xmx1g
46+
JVM_OPTS: -Xmx1g --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED
4147
TERM: dumb
4248
muzzle:
43-
runs-on: ubuntu-20.04
49+
runs-on: ubuntu-latest
4450
steps:
4551
- name: Check out code
4652
uses: actions/checkout@v2.3.4
@@ -50,6 +56,12 @@ jobs:
5056
fetch-depth: 0
5157
submodules: true
5258

59+
- name: Set up JDK 11
60+
uses: actions/setup-java@v2
61+
with:
62+
distribution: adopt
63+
java-version: 11
64+
5365
- name: create checksum file
5466
uses: hypertrace/github-actions/checksum@main
5567

@@ -66,12 +78,12 @@ jobs:
6678
- name: muzzle
6779
run: make muzzle
6880
env:
69-
JVM_OPTS: -Xmx1g
81+
JVM_OPTS: -Xmx1g --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED
7082
TERM: dumb
7183

7284
#TODO
7385
# dependency-check:
74-
# runs-on: ubuntu-20.04
86+
# runs-on: ubuntu-latest
7587
# steps:
7688
# - name: Check out code
7789
# uses: actions/checkout@v2.3.4

‎.github/workflows/release.yaml

+24-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55

66
jobs:
77
test:
8-
runs-on: ubuntu-20.04
8+
runs-on: ubuntu-latest
99
steps:
1010
# Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
1111
- name: Check out code
@@ -14,6 +14,12 @@ jobs:
1414
fetch-depth: 0
1515
submodules: true
1616

17+
- name: Set up JDK 11
18+
uses: actions/setup-java@v2
19+
with:
20+
distribution: adopt
21+
java-version: 11
22+
1723
- name: create checksum file
1824
uses: hypertrace/github-actions/checksum@main
1925

@@ -30,11 +36,11 @@ jobs:
3036
- name: build
3137
run: make build
3238
env:
33-
JVM_OPTS: -Xmx1g
39+
JVM_OPTS: -Xmx1g --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED
3440
TERM: dumb
3541

3642
smoke-test:
37-
runs-on: ubuntu-20.04
43+
runs-on: ubuntu-latest
3844
strategy:
3945
matrix:
4046
suite: [ "glassfish", "jetty", "liberty", "tomcat", "tomee", "wildfly", "other" ]
@@ -47,6 +53,12 @@ jobs:
4753
fetch-depth: 0
4854
submodules: true
4955

56+
- name: Set up JDK 11
57+
uses: actions/setup-java@v2
58+
with:
59+
distribution: adopt
60+
java-version: 11
61+
5062
- name: create checksum file
5163
uses: hypertrace/github-actions/checksum@main
5264

@@ -63,12 +75,12 @@ jobs:
6375
- name: smoke-test
6476
run: make smoke-test SMOKE_TEST_SUITE=${{ matrix.suite }}
6577
env:
66-
JVM_OPTS: -Xmx1g
78+
JVM_OPTS: -Xmx1g --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED
6779
TERM: dumb
6880

6981
release:
7082
needs: [ test, smoke-test ]
71-
runs-on: ubuntu-20.04
83+
runs-on: ubuntu-latest
7284
steps:
7385
# Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
7486
- name: Check out code
@@ -77,6 +89,12 @@ jobs:
7789
fetch-depth: 0
7890
submodules: true
7991

92+
- name: Set up JDK 11
93+
uses: actions/setup-java@v2
94+
with:
95+
distribution: adopt
96+
java-version: 11
97+
8098
- name: create checksum file
8199
uses: hypertrace/github-actions/checksum@main
82100

@@ -96,7 +114,7 @@ jobs:
96114
ORG_GRADLE_PROJECT_signingKey=$(echo $SIGNING_KEY | base64 -d) ./gradlew publish
97115
./gradlew closeAndReleaseRepository
98116
env:
99-
JVM_OPTS: -Xmx1g
117+
JVM_OPTS: -Xmx1g --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED
100118
TERM: dumb
101119
ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.ORG_GRADLE_PROJECT_OSSRHUSERNAME }}
102120
ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.ORG_GRADLE_PROJECT_OSSRHPASSWORD }}

‎.github/workflows/smoke-test.yml

+8-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010

1111
jobs:
1212
smoke-test:
13-
runs-on: ubuntu-20.04
13+
runs-on: ubuntu-latest
1414
strategy:
1515
matrix:
1616
suite: [ "glassfish", "jetty", "liberty", "tomcat", "tomee", "wildfly", "other" ]
@@ -25,6 +25,12 @@ jobs:
2525
fetch-depth: 0
2626
submodules: true
2727

28+
- name: Set up JDK 11
29+
uses: actions/setup-java@v2
30+
with:
31+
distribution: adopt
32+
java-version: 11
33+
2834
- name: create checksum file
2935
uses: hypertrace/github-actions/checksum@main
3036

@@ -41,5 +47,5 @@ jobs:
4147
- name: smoke-test
4248
run: make smoke-test SMOKE_TEST_SUITE=${{ matrix.suite }}
4349
env:
44-
JVM_OPTS: -Xmx1g
50+
JVM_OPTS: -Xmx1g --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED
4551
TERM: dumb

0 commit comments

Comments
 (0)