From: Hans Kristian Rosbach Date: Fri, 10 Oct 2025 11:15:38 +0000 (+0200) Subject: Update s390x actions runner. X-Git-Tag: 2.3.0-rc1~11 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4fdd2e51400fe1d08f1ed4904f2a93d5d8bdda45;p=thirdparty%2Fzlib-ng.git Update s390x actions runner. - Update to EL10 - Update URL to s390x runner patch --- diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 9449b3fc..21e06188 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -364,7 +364,7 @@ jobs: gcov-exec: s390x-linux-gnu-gcov codecov: ubuntu_gcc_s390x_no_crc32 - - name: ${{ github.repository == 'zlib-ng/zlib-ng' && 'EL9' || 'Ubuntu' }} GCC S390X DFLTCC ASAN + - name: ${{ github.repository == 'zlib-ng/zlib-ng' && 'EL10' || 'Ubuntu' }} GCC S390X DFLTCC ASAN os: ${{ github.repository == 'zlib-ng/zlib-ng' && 'z15' || 'ubuntu-latest' }} compiler: gcc cxx-compiler: g++ @@ -375,11 +375,11 @@ jobs: asan-options: detect_leaks=0 ldflags: -static gcov-exec: ${{ github.repository == 'zlib-ng/zlib-ng' && 'gcov' || 's390x-linux-gnu-gcov' }} - codecov: ${{ github.repository == 'zlib-ng/zlib-ng' && 'el9_gcc_s390x_dfltcc' || 'ubuntu_gcc_s390x_dfltcc' }} + codecov: ${{ github.repository == 'zlib-ng/zlib-ng' && 'el10_gcc_s390x_dfltcc' || 'ubuntu_gcc_s390x_dfltcc' }} # The dedicated z15 test VM has 4 cores parallels-jobs: 4 - - name: ${{ github.repository == 'zlib-ng/zlib-ng' && 'EL9' || 'Ubuntu' }} GCC S390X DFLTCC UBSAN + - name: ${{ github.repository == 'zlib-ng/zlib-ng' && 'EL10' || 'Ubuntu' }} GCC S390X DFLTCC UBSAN os: ${{ github.repository == 'zlib-ng/zlib-ng' && 'z15' || 'ubuntu-latest' }} compiler: gcc cxx-compiler: g++ @@ -389,11 +389,11 @@ jobs: packages: qemu-user gcc-s390x-linux-gnu g++-s390x-linux-gnu libc-dev-s390x-cross ldflags: -static gcov-exec: ${{ github.repository == 'zlib-ng/zlib-ng' && 'gcov' || 's390x-linux-gnu-gcov' }} - codecov: ${{ github.repository == 'zlib-ng/zlib-ng' && 'el9_gcc_s390x_dfltcc' || 'ubuntu_gcc_s390x_dfltcc' }} + codecov: ${{ github.repository == 'zlib-ng/zlib-ng' && 'el10_gcc_s390x_dfltcc' || 'ubuntu_gcc_s390x_dfltcc' }} # The dedicated z15 test VM has 4 cores parallels-jobs: 4 - - name: ${{ github.repository == 'zlib-ng/zlib-ng' && 'EL9' || 'Ubuntu' }} Clang S390X DFLTCC ${{ (github.repository == 'zlib-ng/zlib-ng' && 'MSAN') || 'Compat' }} + - name: ${{ github.repository == 'zlib-ng/zlib-ng' && 'EL10' || 'Ubuntu' }} Clang S390X DFLTCC ${{ (github.repository == 'zlib-ng/zlib-ng' && 'MSAN') || 'Compat' }} os: ${{ github.repository == 'zlib-ng/zlib-ng' && 'z15' || 'ubuntu-latest' }} compiler: ${{ github.repository == 'zlib-ng/zlib-ng' && 'clang' || 'clang-15' }} cxx-compiler: ${{ github.repository == 'zlib-ng/zlib-ng' && 'clang++' || 'clang++-15' }} diff --git a/.github/workflows/configure.yml b/.github/workflows/configure.yml index d9050fb0..34cabf70 100644 --- a/.github/workflows/configure.yml +++ b/.github/workflows/configure.yml @@ -162,7 +162,7 @@ jobs: cflags: -static ldflags: -static - - name: ${{ github.repository == 'zlib-ng/zlib-ng' && 'EL9' || 'Ubuntu' }} GCC S390X DFLTCC + - name: ${{ github.repository == 'zlib-ng/zlib-ng' && 'EL10' || 'Ubuntu' }} GCC S390X DFLTCC os: ${{ github.repository == 'zlib-ng/zlib-ng' && 'z15' || 'ubuntu-latest' }} compiler: ${{ github.repository == 'zlib-ng/zlib-ng' && 'gcc' || 's390x-linux-gnu-gcc' }} configure-args: --warn --static --with-dfltcc-deflate --with-dfltcc-inflate @@ -171,7 +171,7 @@ jobs: cflags: ${{ github.repository != 'zlib-ng/zlib-ng' && '-static' || '' }} ldflags: ${{ github.repository != 'zlib-ng/zlib-ng' && '-static' || '' }} - - name: ${{ github.repository == 'zlib-ng/zlib-ng' && 'EL9' || 'Ubuntu' }} GCC S390X DFLTCC Compat + - name: ${{ github.repository == 'zlib-ng/zlib-ng' && 'EL10' || 'Ubuntu' }} GCC S390X DFLTCC Compat os: ${{ github.repository == 'zlib-ng/zlib-ng' && 'z15' || 'ubuntu-latest' }} compiler: ${{ github.repository == 'zlib-ng/zlib-ng' && 'gcc' || 's390x-linux-gnu-gcc' }} configure-args: --warn --zlib-compat --static --with-dfltcc-deflate --with-dfltcc-inflate diff --git a/arch/s390/self-hosted-builder/actions-runner-rebuild.sh b/arch/s390/self-hosted-builder/actions-runner-rebuild.sh index af02d87e..0fcd67d4 100644 --- a/arch/s390/self-hosted-builder/actions-runner-rebuild.sh +++ b/arch/s390/self-hosted-builder/actions-runner-rebuild.sh @@ -15,10 +15,6 @@ else wget https://raw.githubusercontent.com/zlib-ng/zlib-ng/refs/heads/develop/arch/s390/self-hosted-builder/entrypoint fi -# Copy rpms needed to workaround VX compiler bug, ref #1852 -mkdir clang -cp /clang-19/*.rpm clang/ - # Stop service systemctl stop actions-runner || true @@ -47,7 +43,6 @@ if [ "$MODE" == "2" ] ; then rm actions-runner.Dockerfile rm actions-runner rm entrypoint - rm -rf clang cd .. rmdir $TMPDIR echo "Deleted tempfiles." diff --git a/arch/s390/self-hosted-builder/actions-runner.Dockerfile b/arch/s390/self-hosted-builder/actions-runner.Dockerfile index 3f800970..3faa078a 100644 --- a/arch/s390/self-hosted-builder/actions-runner.Dockerfile +++ b/arch/s390/self-hosted-builder/actions-runner.Dockerfile @@ -1,6 +1,6 @@ # Self-Hosted IBM Z Github Actions Runner. -FROM almalinux:9 +FROM almalinux:10 RUN dnf update -y -q && \ dnf install -y -q --enablerepo=crb wget git which sudo jq sed \ @@ -17,7 +17,7 @@ RUN cd /tmp && \ cd runner && \ git checkout $(git tag --sort=-v:refname | grep '^v[0-9]' | head -n1) && \ git log -n 1 && \ - wget https://github.com/anup-kodlekere/gaplib/raw/refs/heads/main/patches/runner-main-sdk8-s390x.patch -O runner-sdk-8.patch && \ + wget https://github.com/ppc64le/gaplib/raw/refs/heads/main/patches/runner-main-sdk8-s390x.patch -O runner-sdk-8.patch && \ git apply --whitespace=nowarn runner-sdk-8.patch && \ sed -i'' -e /version/s/8......\"$/$8.0.100\"/ src/global.json