GHA: D'oh

Author: nicowilliams

.github/workflows/build-linux.yml

@@ -91,20 +91,20 @@ jobs:
       - name: 'Cache sysroot'
         uses: actions/cache@v3
         with:
-          path: sysroot-bullseye
-          key: sysroot-bullseye-${{ runner.as }}
+          path: sysroot-focal
+          key: sysroot-focal-${{ runner.as }}
 
       - name: 'Setup cross-compilation sysroot'
         run: |
           set -vx
-          if [ ! -d sysroot-bullseye ]; then
-            sudo debootstrap --arch=$(dpkg --print-architecture) bullseye sysroot-bullseye http://archive.ubuntu.com/ubuntu
+          if [ ! -d sysroot-focal ]; then
+            sudo debootstrap --arch=$(dpkg --print-architecture) focal sysroot-focal http://archive.ubuntu.com/ubuntu
           fi
-          sudo chroot sysroot-bullseye apt-get update
-          sudo chroot sysroot-bullseye 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 debian-archive-keyring
+          sudo chroot sysroot-focal apt-get update
+          sudo chroot sysroot-focal 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 debian-archive-keyring
           # If we really need gcc-10, we can get it from this PPA:
-          sudo chroot sysroot-bullseye apt-get install -y software-properties-common
-          sudo chroot sysroot-bullseye sudo add-apt-repository ppa:ubuntu-toolchain-r/test
+          sudo chroot sysroot-focal apt-get install -y software-properties-common
+          sudo chroot sysroot-focal sudo add-apt-repository ppa:ubuntu-toolchain-r/test
 
       - name: 'Checkout the JDK source'
         uses: actions/checkout@v3.6.0
@@ -157,10 +157,10 @@ jobs:
           --with-gtest=${{ steps.gtest.outputs.path }}
           --with-zlib=system
           --with-jmod-compress=zip-1
-          --with-sysroot=$PWD/sysroot-bullseye
-          --with-extra-cflags="--sysroot=$PWD/sysroot-bullseye"
-          --with-extra-cxxflags="--sysroot=$PWD/sysroot-bullseye"
-          --with-extra-ldflags="--sysroot=$PWD/sysroot-bullseye"
+          --with-sysroot=$PWD/sysroot-focal
+          --with-extra-cflags="--sysroot=$PWD/sysroot-focal"
+          --with-extra-cxxflags="--sysroot=$PWD/sysroot-focal"
+          --with-extra-ldflags="--sysroot=$PWD/sysroot-focal"
           ${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
           echo "Dumping config.log:" &&
           cat config.log &&