infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 03:58:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

8372733: GHA: Bump to Ubuntu 24.04

Browse Source 
Reviewed-by: erikj, ayang
This commit is contained in:
Aleksey Shipilev 2025-12-03 09:24:33 +00:00
parent a25e6f6462
commit 177f3404df
4 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build-alpine-linux.yml vendored
View File

@ -59,7 +59,7 @@ on:
jobs: jobs:
build-linux: build-linux:
name: build name: build
runs-on: ubuntu-22.04 runs-on: ubuntu-24.04
container: container:
image: alpine:3.20 image: alpine:3.20

2
.github/workflows/build-cross-compile.yml vendored
View File

@ -48,7 +48,7 @@ on:
jobs: jobs:
build-cross-compile: build-cross-compile:
name: build name: build
runs-on: ubuntu-22.04 runs-on: ubuntu-24.04
strategy: strategy:
fail-fast: false fail-fast: false

20
.github/workflows/build-linux.yml vendored
View File

@ -75,7 +75,7 @@ on:
jobs: jobs:
build-linux: build-linux:
name: build name: build
runs-on: ubuntu-22.04 runs-on: ubuntu-24.04
strategy: strategy:
fail-fast: false fail-fast: false
@ -115,9 +115,21 @@ jobs:
if [[ '${{ inputs.apt-architecture }}' != '' ]]; then if [[ '${{ inputs.apt-architecture }}' != '' ]]; then
sudo dpkg --add-architecture ${{ inputs.apt-architecture }} sudo dpkg --add-architecture ${{ inputs.apt-architecture }}
fi fi
sudo apt-get update sudo apt update
sudo apt-get install --only-upgrade apt sudo apt install --only-upgrade apt
sudo apt-get install gcc-${{ inputs.gcc-major-version }}${{ inputs.gcc-package-suffix }} g++-${{ inputs.gcc-major-version }}${{ inputs.gcc-package-suffix }} libxrandr-dev${{ steps.arch.outputs.suffix }} libxtst-dev${{ steps.arch.outputs.suffix }} libcups2-dev${{ steps.arch.outputs.suffix }} libasound2-dev${{ steps.arch.outputs.suffix }} ${{ inputs.apt-extra-packages }} sudo apt install \
gcc-${{ inputs.gcc-major-version }}${{ inputs.gcc-package-suffix }} \
g++-${{ inputs.gcc-major-version }}${{ inputs.gcc-package-suffix }} \
libasound2-dev${{ steps.arch.outputs.suffix }} \
libcups2-dev${{ steps.arch.outputs.suffix }} \
libfontconfig1-dev${{ steps.arch.outputs.suffix }} \
libx11-dev${{ steps.arch.outputs.suffix }} \
libxext-dev${{ steps.arch.outputs.suffix }} \
libxrandr-dev${{ steps.arch.outputs.suffix }} \
libxrender-dev${{ steps.arch.outputs.suffix }} \
libxt-dev${{ steps.arch.outputs.suffix }} \
libxtst-dev${{ steps.arch.outputs.suffix }} \
${{ inputs.apt-extra-packages }}
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{ inputs.gcc-major-version }} 100 --slave /usr/bin/g++ g++ /usr/bin/g++-${{ inputs.gcc-major-version }} sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{ inputs.gcc-major-version }} 100 --slave /usr/bin/g++ g++ /usr/bin/g++-${{ inputs.gcc-major-version }}
- name: 'Configure' - name: 'Configure'

6
.github/workflows/main.yml vendored
View File

@ -57,7 +57,7 @@ jobs:
prepare: prepare:
name: 'Prepare the run' name: 'Prepare the run'
runs-on: ubuntu-22.04 runs-on: ubuntu-24.04
env: env:
# List of platforms to exclude by default # List of platforms to exclude by default
EXCLUDED_PLATFORMS: 'alpine-linux-x64' EXCLUDED_PLATFORMS: 'alpine-linux-x64'
@ -405,7 +405,7 @@ jobs:
with: with:
platform: linux-x64 platform: linux-x64
bootjdk-platform: linux-x64 bootjdk-platform: linux-x64
runs-on: ubuntu-22.04 runs-on: ubuntu-24.04
dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }} dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
debug-suffix: -debug debug-suffix: -debug
@ -419,7 +419,7 @@ jobs:
with: with:
platform: linux-x64 platform: linux-x64
bootjdk-platform: linux-x64 bootjdk-platform: linux-x64
runs-on: ubuntu-22.04 runs-on: ubuntu-24.04
dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }} dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
static-suffix: "-static" static-suffix: "-static"