fixup! GHA: Try using a sysroot instead of a container

Author: nicowilliams

.github/actions/do-build/action.yml

@@ -66,7 +66,7 @@ runs:
       shell: bash
 
     - name: 'Upload build logs'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: failure-logs-${{ inputs.platform }}${{ inputs.debug-suffix }}
         path: failure-logs

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

@@ -48,14 +48,14 @@ runs:
   steps:
     - name: 'Download bundles artifact'
       id: download-bundles
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}
         path: bundles
       continue-on-error: true
 
     - name: 'Download bundles artifact (retry)'
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}
         path: bundles

.github/actions/upload-bundles/action.yml

@@ -69,7 +69,7 @@ runs:
       shell: bash
 
     - name: 'Upload bundles artifact'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}
         path: bundles

.github/workflows/build-linux.yml

@@ -91,28 +91,34 @@ jobs:
           sudo apt-get install -y software-properties-common schroot fakeroot fakechroot
           sudo add-apt-repository ppa:ubuntu-toolchain-r/test
 
+      - name: 'Checkout the JDK source'
+        uses: actions/checkout@v4
+
       - name: 'Cache sysroot'
+        id: cache-sysroot
         uses: actions/cache@v3
         with:
-          path: sysroot-focal
+          path: ${{ github.workspace }}/sysroot-focal
           key: sysroot-focal-${{ runner.as }}
 
       - name: 'Setup cross-compilation sysroot'
+        if: steps.cache-sysroot.oututs.cache-hit != 'true'
         run: |
           set -vx
+          SYSROOT_PATH="${{ github.workspace }}/sysroot-focal"
+          echo "SYSROOT_PATH=$SYSROOT_PATH" >> $GITHUB_ENV
           if [ ! -d sysroot-focal ]; then
-            sudo debootstrap --arch=$(dpkg --print-architecture) --foreign focal sysroot-focal http://archive.ubuntu.com/ubuntu
+            sudo debootstrap --arch=$(dpkg --print-architecture) 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
+          sudo chroot sysroot-focal apt-get update
+          sudo chroot sysroot-focal 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
+          sudo chroot sysroot-focal apt-get install -y software-properties-common
+          sudo chroot sysroot-focal 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.6.0
+          echo $PWD
+          ls -F
 
       - name: 'Get the BootJDK'
         id: bootjdk
@@ -152,6 +158,9 @@ jobs:
 
       - name: 'Configure'
         run: >
+          set -vx &&
+          pwd &&
+          ls -F &&
           bash configure
           --with-conf-name=${{ inputs.platform }}
           ${{ matrix.flags }}
@@ -162,13 +171,14 @@ 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"
+          --with-sysroot=${{ env.SYSROOT_PATH }}
+          --with-extra-cflags=--sysroot=${{ env.SYSROOT_PATH }}
+          --with-extra-cxxflags=--sysroot=${{ env.SYSROOT_PATH }}
+          --with-extra-ldflags=--sysroot=${{ env.SYSROOT_PATH }}
           ${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
           echo "Dumping config.log:" &&
           cat config.log &&
+          echo PWD=$PWD &&
           exit 1)
 
       - name: 'Build'

.github/workflows/test.yml

@@ -195,7 +195,7 @@ jobs:
         if: always()
 
       - name: 'Upload test results'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: results
           name: ${{ steps.package.outputs.artifact-name }}