Skip to content

Commit d753658

Browse files
committed
8293107: GHA: Bump to Ubuntu 22.04
Reviewed-by: ihse
1 parent d4e3e69 commit d753658

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

.github/workflows/build-cross-compile.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ on:
4141
jobs:
4242
build-cross-compile:
4343
name: build
44-
runs-on: ubuntu-20.04
44+
runs-on: ubuntu-22.04
4545

4646
strategy:
4747
fail-fast: false
@@ -115,7 +115,7 @@ jobs:
115115
--verbose
116116
--include=fakeroot,symlinks,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype6-dev,libpng-dev
117117
--resolve-deps
118-
buster
118+
bullseye
119119
sysroot
120120
https://httpredir.debian.org/debian/
121121
if: steps.get-cached-sysroot.outputs.cache-hit != 'true'

.github/workflows/build-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ on:
6262
jobs:
6363
build-linux:
6464
name: build
65-
runs-on: ubuntu-20.04
65+
runs-on: ubuntu-22.04
6666

6767
strategy:
6868
fail-fast: false

.github/workflows/main.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949

5050
select:
5151
name: 'Select platforms'
52-
runs-on: ubuntu-20.04
52+
runs-on: ubuntu-22.04
5353
outputs:
5454
linux-x64: ${{ steps.include.outputs.linux-x64 }}
5555
linux-x86: ${{ steps.include.outputs.linux-x86 }}
@@ -124,7 +124,7 @@ jobs:
124124
with:
125125
platform: linux-x64
126126
gcc-major-version: '10'
127-
apt-gcc-version: '10.3.0-1ubuntu1~20.04'
127+
apt-gcc-version: '10.3.0-15ubuntu1'
128128
# The linux-x64 jdk bundle is used as buildjdk for the cross-compile job
129129
if: needs.select.outputs.linux-x64 == 'true' || needs.select.outputs.linux-cross-compile == 'true'
130130

@@ -136,7 +136,7 @@ jobs:
136136
platform: linux-x86
137137
gcc-major-version: '10'
138138
gcc-package-suffix: '-multilib'
139-
apt-gcc-version: '10.3.0-1ubuntu1~20.04'
139+
apt-gcc-version: '10.3.0-15ubuntu1'
140140
apt-architecture: 'i386'
141141
# Some multilib libraries do not have proper inter-dependencies, so we have to
142142
# install their dependencies manually.
@@ -153,7 +153,7 @@ jobs:
153153
make-target: 'hotspot'
154154
debug-levels: '[ "debug" ]'
155155
gcc-major-version: '10'
156-
apt-gcc-version: '10.3.0-1ubuntu1~20.04'
156+
apt-gcc-version: '10.3.0-15ubuntu1'
157157
extra-conf-options: '--disable-precompiled-headers'
158158
if: needs.select.outputs.linux-x64-variants == 'true'
159159

@@ -166,7 +166,7 @@ jobs:
166166
make-target: 'hotspot'
167167
debug-levels: '[ "debug" ]'
168168
gcc-major-version: '10'
169-
apt-gcc-version: '10.3.0-1ubuntu1~20.04'
169+
apt-gcc-version: '10.3.0-15ubuntu1'
170170
extra-conf-options: '--with-jvm-variants=zero --disable-precompiled-headers'
171171
if: needs.select.outputs.linux-x64-variants == 'true'
172172

@@ -179,7 +179,7 @@ jobs:
179179
make-target: 'hotspot'
180180
debug-levels: '[ "debug" ]'
181181
gcc-major-version: '10'
182-
apt-gcc-version: '10.3.0-1ubuntu1~20.04'
182+
apt-gcc-version: '10.3.0-15ubuntu1'
183183
extra-conf-options: '--with-jvm-variants=minimal --disable-precompiled-headers'
184184
if: needs.select.outputs.linux-x64-variants == 'true'
185185

@@ -193,7 +193,7 @@ jobs:
193193
# Technically this is not the "debug" level, but we can't inject a new matrix state for just this job
194194
debug-levels: '[ "debug" ]'
195195
gcc-major-version: '10'
196-
apt-gcc-version: '10.3.0-1ubuntu1~20.04'
196+
apt-gcc-version: '10.3.0-15ubuntu1'
197197
extra-conf-options: '--with-debug-level=optimized --disable-precompiled-headers'
198198
if: needs.select.outputs.linux-x64-variants == 'true'
199199

@@ -205,8 +205,8 @@ jobs:
205205
uses: ./.github/workflows/build-cross-compile.yml
206206
with:
207207
gcc-major-version: '10'
208-
apt-gcc-version: '10.3.0-1ubuntu1~20.04'
209-
apt-gcc-cross-version: '10.3.0-1ubuntu1~20.04cross1'
208+
apt-gcc-version: '10.3.0-15ubuntu1'
209+
apt-gcc-cross-version: '10.3.0-8ubuntu1cross1'
210210
if: needs.select.outputs.linux-cross-compile == 'true'
211211

212212
build-macos-x64:
@@ -262,7 +262,7 @@ jobs:
262262
with:
263263
platform: linux-x64
264264
bootjdk-platform: linux-x64
265-
runs-on: ubuntu-20.04
265+
runs-on: ubuntu-22.04
266266

267267
test-linux-x86:
268268
name: linux-x86
@@ -272,7 +272,7 @@ jobs:
272272
with:
273273
platform: linux-x86
274274
bootjdk-platform: linux-x64
275-
runs-on: ubuntu-20.04
275+
runs-on: ubuntu-22.04
276276

277277
test-macos-x64:
278278
name: macos-x64
@@ -297,7 +297,7 @@ jobs:
297297
# Remove bundles so they are not misconstrued as binary distributions from the JDK project
298298
remove-bundles:
299299
name: 'Remove bundle artifacts'
300-
runs-on: ubuntu-20.04
300+
runs-on: ubuntu-22.04
301301
if: always()
302302
needs:
303303
- build-linux-x64

0 commit comments

Comments
 (0)