8293107: GHA: Bump to Ubuntu 22.04

Reviewed-by: ihse
This commit is contained in:
Aleksey Shipilev 2022-09-05 13:28:51 +00:00
parent d4e3e69505
commit d7536588b3
3 changed files with 15 additions and 15 deletions

View File

@ -41,7 +41,7 @@ on:
jobs: jobs:
build-cross-compile: build-cross-compile:
name: build name: build
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
strategy: strategy:
fail-fast: false fail-fast: false
@ -115,7 +115,7 @@ jobs:
--verbose --verbose
--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 --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
--resolve-deps --resolve-deps
buster bullseye
sysroot sysroot
https://httpredir.debian.org/debian/ https://httpredir.debian.org/debian/
if: steps.get-cached-sysroot.outputs.cache-hit != 'true' if: steps.get-cached-sysroot.outputs.cache-hit != 'true'

View File

@ -62,7 +62,7 @@ on:
jobs: jobs:
build-linux: build-linux:
name: build name: build
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
strategy: strategy:
fail-fast: false fail-fast: false

View File

@ -49,7 +49,7 @@ jobs:
select: select:
name: 'Select platforms' name: 'Select platforms'
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
outputs: outputs:
linux-x64: ${{ steps.include.outputs.linux-x64 }} linux-x64: ${{ steps.include.outputs.linux-x64 }}
linux-x86: ${{ steps.include.outputs.linux-x86 }} linux-x86: ${{ steps.include.outputs.linux-x86 }}
@ -124,7 +124,7 @@ jobs:
with: with:
platform: linux-x64 platform: linux-x64
gcc-major-version: '10' gcc-major-version: '10'
apt-gcc-version: '10.3.0-1ubuntu1~20.04' apt-gcc-version: '10.3.0-15ubuntu1'
# The linux-x64 jdk bundle is used as buildjdk for the cross-compile job # The linux-x64 jdk bundle is used as buildjdk for the cross-compile job
if: needs.select.outputs.linux-x64 == 'true' || needs.select.outputs.linux-cross-compile == 'true' if: needs.select.outputs.linux-x64 == 'true' || needs.select.outputs.linux-cross-compile == 'true'
@ -136,7 +136,7 @@ jobs:
platform: linux-x86 platform: linux-x86
gcc-major-version: '10' gcc-major-version: '10'
gcc-package-suffix: '-multilib' gcc-package-suffix: '-multilib'
apt-gcc-version: '10.3.0-1ubuntu1~20.04' apt-gcc-version: '10.3.0-15ubuntu1'
apt-architecture: 'i386' apt-architecture: 'i386'
# Some multilib libraries do not have proper inter-dependencies, so we have to # Some multilib libraries do not have proper inter-dependencies, so we have to
# install their dependencies manually. # install their dependencies manually.
@ -153,7 +153,7 @@ jobs:
make-target: 'hotspot' make-target: 'hotspot'
debug-levels: '[ "debug" ]' debug-levels: '[ "debug" ]'
gcc-major-version: '10' gcc-major-version: '10'
apt-gcc-version: '10.3.0-1ubuntu1~20.04' apt-gcc-version: '10.3.0-15ubuntu1'
extra-conf-options: '--disable-precompiled-headers' extra-conf-options: '--disable-precompiled-headers'
if: needs.select.outputs.linux-x64-variants == 'true' if: needs.select.outputs.linux-x64-variants == 'true'
@ -166,7 +166,7 @@ jobs:
make-target: 'hotspot' make-target: 'hotspot'
debug-levels: '[ "debug" ]' debug-levels: '[ "debug" ]'
gcc-major-version: '10' gcc-major-version: '10'
apt-gcc-version: '10.3.0-1ubuntu1~20.04' apt-gcc-version: '10.3.0-15ubuntu1'
extra-conf-options: '--with-jvm-variants=zero --disable-precompiled-headers' extra-conf-options: '--with-jvm-variants=zero --disable-precompiled-headers'
if: needs.select.outputs.linux-x64-variants == 'true' if: needs.select.outputs.linux-x64-variants == 'true'
@ -179,7 +179,7 @@ jobs:
make-target: 'hotspot' make-target: 'hotspot'
debug-levels: '[ "debug" ]' debug-levels: '[ "debug" ]'
gcc-major-version: '10' gcc-major-version: '10'
apt-gcc-version: '10.3.0-1ubuntu1~20.04' apt-gcc-version: '10.3.0-15ubuntu1'
extra-conf-options: '--with-jvm-variants=minimal --disable-precompiled-headers' extra-conf-options: '--with-jvm-variants=minimal --disable-precompiled-headers'
if: needs.select.outputs.linux-x64-variants == 'true' if: needs.select.outputs.linux-x64-variants == 'true'
@ -193,7 +193,7 @@ jobs:
# Technically this is not the "debug" level, but we can't inject a new matrix state for just this job # Technically this is not the "debug" level, but we can't inject a new matrix state for just this job
debug-levels: '[ "debug" ]' debug-levels: '[ "debug" ]'
gcc-major-version: '10' gcc-major-version: '10'
apt-gcc-version: '10.3.0-1ubuntu1~20.04' apt-gcc-version: '10.3.0-15ubuntu1'
extra-conf-options: '--with-debug-level=optimized --disable-precompiled-headers' extra-conf-options: '--with-debug-level=optimized --disable-precompiled-headers'
if: needs.select.outputs.linux-x64-variants == 'true' if: needs.select.outputs.linux-x64-variants == 'true'
@ -205,8 +205,8 @@ jobs:
uses: ./.github/workflows/build-cross-compile.yml uses: ./.github/workflows/build-cross-compile.yml
with: with:
gcc-major-version: '10' gcc-major-version: '10'
apt-gcc-version: '10.3.0-1ubuntu1~20.04' apt-gcc-version: '10.3.0-15ubuntu1'
apt-gcc-cross-version: '10.3.0-1ubuntu1~20.04cross1' apt-gcc-cross-version: '10.3.0-8ubuntu1cross1'
if: needs.select.outputs.linux-cross-compile == 'true' if: needs.select.outputs.linux-cross-compile == 'true'
build-macos-x64: build-macos-x64:
@ -262,7 +262,7 @@ jobs:
with: with:
platform: linux-x64 platform: linux-x64
bootjdk-platform: linux-x64 bootjdk-platform: linux-x64
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
test-linux-x86: test-linux-x86:
name: linux-x86 name: linux-x86
@ -272,7 +272,7 @@ jobs:
with: with:
platform: linux-x86 platform: linux-x86
bootjdk-platform: linux-x64 bootjdk-platform: linux-x64
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
test-macos-x64: test-macos-x64:
name: macos-x64 name: macos-x64
@ -297,7 +297,7 @@ jobs:
# Remove bundles so they are not misconstrued as binary distributions from the JDK project # Remove bundles so they are not misconstrued as binary distributions from the JDK project
remove-bundles: remove-bundles:
name: 'Remove bundle artifacts' name: 'Remove bundle artifacts'
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
if: always() if: always()
needs: needs:
- build-linux-x64 - build-linux-x64