Skip to content

Commit aac13a2

Browse files
committed
Merge branch '2.18' into 2.19
2 parents b7ac1f0 + 3824b11 commit aac13a2

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

.github/workflows/dep_build_v2.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,11 @@ permissions:
1111
jobs:
1212
build:
1313
# Do we want wide matrix build? For now, limited
14-
runs-on: ${{ matrix.os }}
14+
runs-on: 'ubuntu-latest'
1515
strategy:
1616
fail-fast: false
1717
matrix:
1818
java_version: ['8', '17', '21']
19-
os: ['ubuntu-22.04']
2019
env:
2120
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
2221
steps:

.github/workflows/dep_build_v3.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,11 @@ permissions:
1111
jobs:
1212
build:
1313
# Do we want wide matrix build? For now, limited
14-
runs-on: ${{ matrix.os }}
14+
runs-on: 'ubuntu-latest'
1515
strategy:
1616
fail-fast: false
1717
matrix:
1818
java_version: ['17', '21']
19-
os: ['ubuntu-22.04']
2019
env:
2120
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
2221
steps:

.github/workflows/main.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ jobs:
2020
strategy:
2121
fail-fast: false
2222
matrix:
23-
java_version: ['8', '11', '17', '21', '23']
24-
os: ['ubuntu-22.04']
23+
java_version: ['8', '11', '17', '21', '23']
24+
os: ['ubuntu-24.04']
2525
include:
2626
- java_version: '8'
27-
os: 'ubuntu-22.04'
27+
os: 'ubuntu-24.04'
2828
release_build: 'R'
2929
- java_version: '8'
3030
os: 'windows-latest'

0 commit comments

Comments
 (0)