GHA: Try using a sysroot instead of a container

Author: nicowilliams

.github/actions/get-gtest/action.yml

@@ -40,7 +40,7 @@ runs:
         var: GTEST_VERSION
 
     - name: 'Checkout GTest source'
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: google/googletest
         ref: 'v${{ steps.version.outputs.value }}'

.github/actions/get-jtreg/action.yml

@@ -52,7 +52,7 @@ runs:
         key: jtreg-${{ steps.version.outputs.value }}
 
     - name: 'Checkout the JTReg source'
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: openjdk/jtreg
         ref: jtreg-${{ steps.version.outputs.value }}

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

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

.github/workflows/build-linux.yml

@@ -65,10 +65,13 @@ on:
 jobs:
   build-linux:
     name: build
-    runs-on: ubuntu-20.04
-    container:
+    runs-on: ubuntu-latest
+    env:
+      ACTIONS_RUNNER_DEBUG: true
+      ACTIONS_STEP_DEBUG: true
+    #container:
       #image: debian:bullseye
-      image: ubuntu:18.04
+      #image: ubuntu:18.04
 
     strategy:
       fail-fast: false
@@ -82,14 +85,34 @@ jobs:
     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
+          sudo apt-get update
+          sudo 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 debootstrap debian-archive-keyring
           # If we really need gcc-10, we can get it from this PPA:
-          apt-get install -y software-properties-common
+          sudo apt-get install -y software-properties-common schroot fakeroot fakechroot
           sudo add-apt-repository ppa:ubuntu-toolchain-r/test
 
+      - name: 'Cache sysroot'
+        uses: actions/cache@v3
+        with:
+          path: sysroot-focal
+          key: sysroot-focal-${{ runner.as }}
+
+      - name: 'Setup cross-compilation sysroot'
+        run: |
+          set -vx
+          if [ ! -d sysroot-focal ]; then
+            sudo debootstrap --arch=$(dpkg --print-architecture) --foreign focal sysroot-focal http://archive.ubuntu.com/ubuntu
+          fi
+          sudo chroot sysroot-focal ${PWD}/sysroot-focal/$(which apt-get) update
+          sudo chroot sysroot-focal ${PWD}/sysroot-focal/$(which apt-get) install -y build-essential git wget curl sudo unzip zip 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 chroot sysroot-focal ${PWD}/sysroot-focal/$(which apt-get) install -y software-properties-common
+          sudo chroot sysroot-focal ${PWD}/sysroot-focal/$(which sudo) add-apt-repository ppa:ubuntu-toolchain-r/test
+          # So the OpenJDK configuration and build can use the sysroot
+          sudo chown -R $USER:$USER sysroot-focal
+
       - name: 'Checkout the JDK source'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.6.0
 
       - name: 'Get the BootJDK'
         id: bootjdk
@@ -139,6 +162,10 @@ jobs:
           --with-gtest=${{ steps.gtest.outputs.path }}
           --with-zlib=system
           --with-jmod-compress=zip-1
+          --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 &&

.github/workflows/build-windows.yml

@@ -63,7 +63,7 @@ env:
 jobs:
   build-windows:
     name: build
-    runs-on: windows-2019
+    runs-on: windows-2022
     defaults:
       run:
         shell: bash

.github/workflows/main.yml

@@ -57,7 +57,7 @@ jobs:
 
   select:
     name: 'Select platforms'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     outputs:
       linux-x64: ${{ steps.include.outputs.linux-x64 }}
       linux-x86: ${{ steps.include.outputs.linux-x86 }}
@@ -300,7 +300,7 @@ jobs:
     with:
       platform: linux-x64
       bootjdk-platform: linux-x64
-      runs-on: ubuntu-20.04
+      runs-on: ubuntu-latest
 
   test-linux-x86:
     name: linux-x86
@@ -310,7 +310,7 @@ jobs:
     with:
       platform: linux-x86
       bootjdk-platform: linux-x64
-      runs-on: ubuntu-20.04
+      runs-on: ubuntu-latest
 
   test-macos-x64:
     name: macos-x64
@@ -330,7 +330,7 @@ jobs:
     with:
       platform: windows-x64
       bootjdk-platform: windows-x64
-      runs-on: windows-2019
+      runs-on: windows-2022
 
   # Remove bundles so they are not misconstrued as binary distributions from the JDK project
   #remove-bundles: