8326960: GHA: RISC-V sysroot cannot be debootstrapped due to ongoing Debian t64 transition

Reviewed-by: fyang, erikj
This commit is contained in:
Aleksey Shipilev 2024-03-22 14:12:37 +00:00
parent e80619a032
commit f207aa94f9

View File

@ -61,27 +61,32 @@ jobs:
debian-arch: arm64 debian-arch: arm64
debian-repository: https://httpredir.debian.org/debian/ debian-repository: https://httpredir.debian.org/debian/
debian-version: bullseye debian-version: bullseye
tolerate-sysroot-errors: false
- target-cpu: arm - target-cpu: arm
gnu-arch: arm gnu-arch: arm
debian-arch: armhf debian-arch: armhf
debian-repository: https://httpredir.debian.org/debian/ debian-repository: https://httpredir.debian.org/debian/
debian-version: bullseye debian-version: bullseye
tolerate-sysroot-errors: false
gnu-abi: eabihf gnu-abi: eabihf
- target-cpu: s390x - target-cpu: s390x
gnu-arch: s390x gnu-arch: s390x
debian-arch: s390x debian-arch: s390x
debian-repository: https://httpredir.debian.org/debian/ debian-repository: https://httpredir.debian.org/debian/
debian-version: bullseye debian-version: bullseye
tolerate-sysroot-errors: false
- target-cpu: ppc64le - target-cpu: ppc64le
gnu-arch: powerpc64le gnu-arch: powerpc64le
debian-arch: ppc64el debian-arch: ppc64el
debian-repository: https://httpredir.debian.org/debian/ debian-repository: https://httpredir.debian.org/debian/
debian-version: bullseye debian-version: bullseye
tolerate-sysroot-errors: false
- target-cpu: riscv64 - target-cpu: riscv64
gnu-arch: riscv64 gnu-arch: riscv64
debian-arch: riscv64 debian-arch: riscv64
debian-repository: https://httpredir.debian.org/debian/ debian-repository: https://httpredir.debian.org/debian/
debian-version: sid debian-version: sid
tolerate-sysroot-errors: true
steps: steps:
- name: 'Checkout the JDK source' - name: 'Checkout the JDK source'
@ -130,6 +135,7 @@ jobs:
if: steps.get-cached-sysroot.outputs.cache-hit != 'true' if: steps.get-cached-sysroot.outputs.cache-hit != 'true'
- name: 'Create sysroot' - name: 'Create sysroot'
id: create-sysroot
run: > run: >
sudo debootstrap sudo debootstrap
--arch=${{ matrix.debian-arch }} --arch=${{ matrix.debian-arch }}
@ -140,6 +146,7 @@ jobs:
${{ matrix.debian-version }} ${{ matrix.debian-version }}
sysroot sysroot
${{ matrix.debian-repository }} ${{ matrix.debian-repository }}
continue-on-error: ${{ matrix.tolerate-sysroot-errors }}
if: steps.get-cached-sysroot.outputs.cache-hit != 'true' if: steps.get-cached-sysroot.outputs.cache-hit != 'true'
- name: 'Prepare sysroot' - name: 'Prepare sysroot'
@ -151,7 +158,12 @@ jobs:
rm -rf sysroot/usr/{sbin,bin,share} rm -rf sysroot/usr/{sbin,bin,share}
rm -rf sysroot/usr/lib/{apt,gcc,udev,systemd} rm -rf sysroot/usr/lib/{apt,gcc,udev,systemd}
rm -rf sysroot/usr/libexec/gcc rm -rf sysroot/usr/libexec/gcc
if: steps.get-cached-sysroot.outputs.cache-hit != 'true' if: steps.create-sysroot.outcome == 'success' && steps.get-cached-sysroot.outputs.cache-hit != 'true'
- name: 'Remove broken sysroot'
run: |
sudo rm -rf sysroot/
if: steps.create-sysroot.outcome != 'success' && steps.get-cached-sysroot.outputs.cache-hit != 'true'
- name: 'Configure' - name: 'Configure'
run: > run: >
@ -173,6 +185,7 @@ jobs:
echo "Dumping config.log:" && echo "Dumping config.log:" &&
cat config.log && cat config.log &&
exit 1) exit 1)
if: steps.create-sysroot.outcome == 'success'
- name: 'Build' - name: 'Build'
id: build id: build
@ -180,3 +193,4 @@ jobs:
with: with:
make-target: 'hotspot ${{ inputs.make-arguments }}' make-target: 'hotspot ${{ inputs.make-arguments }}'
platform: linux-${{ matrix.target-cpu }} platform: linux-${{ matrix.target-cpu }}
if: steps.create-sysroot.outcome == 'success'