Skip to content

Commit 4296b22

Browse files
committed
fixup! GHA: Try using a sysroot instead of a container
1 parent 0df744d commit 4296b22

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

.github/workflows/build-linux.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,15 +101,16 @@ jobs:
101101
run: |
102102
set -vx
103103
if [ ! -d sysroot-focal ]; then
104-
sudo debootstrap --arch=$(dpkg --print-architecture) --foreign focal sysroot-focal http://archive.ubuntu.com/ubuntu
104+
sudo debootstrap --arch=$(dpkg --print-architecture) focal sysroot-focal http://archive.ubuntu.com/ubuntu
105105
fi
106-
sudo chroot sysroot-focal ${PWD}/sysroot-focal/$(which apt-get) update
107-
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
106+
sudo chroot sysroot-focal apt-get update
107+
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
108108
# If we really need gcc-10, we can get it from this PPA:
109-
sudo chroot sysroot-focal ${PWD}/sysroot-focal/$(which apt-get) install -y software-properties-common
110-
sudo chroot sysroot-focal ${PWD}/sysroot-focal/$(which sudo) add-apt-repository ppa:ubuntu-toolchain-r/test
109+
sudo chroot sysroot-focal apt-get install -y software-properties-common
110+
sudo chroot sysroot-focal sudo add-apt-repository ppa:ubuntu-toolchain-r/test
111111
# So the OpenJDK configuration and build can use the sysroot
112112
sudo chown -R $USER:$USER sysroot-focal
113+
echo $PWD
113114
114115
- name: 'Checkout the JDK source'
115116
uses: actions/checkout@v3.6.0
@@ -152,6 +153,7 @@ jobs:
152153
153154
- name: 'Configure'
154155
run: >
156+
set -vx &&
155157
bash configure
156158
--with-conf-name=${{ inputs.platform }}
157159
${{ matrix.flags }}
@@ -169,6 +171,7 @@ jobs:
169171
${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
170172
echo "Dumping config.log:" &&
171173
cat config.log &&
174+
echo PWD=$PWD &&
172175
exit 1)
173176
174177
- name: 'Build'

0 commit comments

Comments
 (0)