Skip to content

Commit

Permalink
GHA: Build in an Ubuntu 20.04 runner
Browse files Browse the repository at this point in the history
  • Loading branch information
nicowilliams committed Jan 19, 2024
1 parent d00ac7f commit 9423db9
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
11 changes: 10 additions & 1 deletion .github/workflows/build-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ on:
jobs:
build-linux:
name: build
runs-on: ubuntu-22.04
runs-on: ubuntu-20.04

strategy:
fail-fast: false
Expand All @@ -77,6 +77,13 @@ jobs:
# suffix: -debug

steps:
- name: 'Install some dependencies'
run: |
apt-get update
apt-get install -y build-essential git wget curl sudo unzip zip openjdk-11-jdk autoconf libfreetype6-dev libcups2-dev libx11-dev libxext-dev libxrender-dev libxrandr-dev libxtst-dev libxt-dev libasound2-dev libffi-dev file binutils libfontconfig-dev
# If we really need gcc-10, we can get it from this PPA:
#sudo add-apt-repository ppa:ubuntu-toolchain-r/test
- name: 'Checkout the JDK source'
uses: actions/checkout@v4

Expand Down Expand Up @@ -104,8 +111,10 @@ jobs:
# Upgrading apt to solve libc6 installation bugs, see JDK-8260460.
- name: 'Install toolchain and dependencies'
shell: bash
run: |
# Install dependencies using apt-get
set -vx
if [[ '${{ inputs.apt-architecture }}' != '' ]]; then
sudo dpkg --add-architecture ${{ inputs.apt-architecture }}
fi
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:

select:
name: 'Select platforms'
runs-on: ubuntu-22.04
runs-on: ubuntu-20.04
outputs:
linux-x64: ${{ steps.include.outputs.linux-x64 }}
linux-x86: ${{ steps.include.outputs.linux-x86 }}
Expand Down Expand Up @@ -300,7 +300,7 @@ jobs:
with:
platform: linux-x64
bootjdk-platform: linux-x64
runs-on: ubuntu-22.04
runs-on: ubuntu-20.04

test-linux-x86:
name: linux-x86
Expand All @@ -310,7 +310,7 @@ jobs:
with:
platform: linux-x86
bootjdk-platform: linux-x64
runs-on: ubuntu-22.04
runs-on: ubuntu-20.04

test-macos-x64:
name: macos-x64
Expand All @@ -335,7 +335,7 @@ jobs:
# Remove bundles so they are not misconstrued as binary distributions from the JDK project
remove-bundles:
name: 'Remove bundle artifacts'
runs-on: ubuntu-22.04
runs-on: ubuntu-20.04
if: always()
needs:
- build-linux-x64
Expand Down

0 comments on commit 9423db9

Please sign in to comment.