diff options
| author | Hans Kristian Rosbach <hk-git@circlestorm.org> | 2026-03-09 20:32:34 +0100 |
|---|---|---|
| committer | Hans Kristian Rosbach <hk-github@circlestorm.org> | 2026-03-10 16:22:09 +0100 |
| commit | 39d2b25a18a7aea760d40d7eefa3f3aa28aa95ba (patch) | |
| tree | f92fee1ab1a146090de0c26c907d48800d880d48 | |
| parent | 3bc177af6d76af020ff2f37d2287f92c6ee76df0 (diff) | |
| download | Project-Tick-39d2b25a18a7aea760d40d7eefa3f3aa28aa95ba.tar.gz Project-Tick-39d2b25a18a7aea760d40d7eefa3f3aa28aa95ba.zip | |
CI: S390x has Clang, but the qemu fallback uses a toolchain specifying gcc,
therefore make sure we install and use gcc.
| -rw-r--r-- | .github/workflows/cmake.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index b0fe65254e..0328ac9389 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -356,14 +356,14 @@ jobs: gcov-exec: ${{ github.repository == 'zlib-ng/zlib-ng' && 'llvm-cov gcov' || 's390x-linux-gnu-gcov' }} coverage: ${{ github.repository == 'zlib-ng/zlib-ng' && 'el10_clang_s390x_dfltcc_ubsan' || 'ubuntu_gcc_s390x_dfltcc_ubsan' }} - - name: ${{ github.repository == 'zlib-ng/zlib-ng' && 'EL10' || 'Ubuntu' }} Clang S390X DFLTCC ${{ (github.repository == 'zlib-ng/zlib-ng' && 'MSAN') || 'Compat' }} + - name: ${{ github.repository == 'zlib-ng/zlib-ng' && 'EL10 Clang' || 'Ubuntu GCC' }} S390X DFLTCC ${{ (github.repository == 'zlib-ng/zlib-ng' && 'MSAN') || 'Compat' }} os: ${{ github.repository == 'zlib-ng/zlib-ng' && 'z15' || 'ubuntu-latest' }} - compiler: clang - cxx-compiler: clang++ + compiler: ${{ github.repository == 'zlib-ng/zlib-ng' && 'clang' || 'gcc' }} + cxx-compiler: ${{ github.repository == 'zlib-ng/zlib-ng' && 'clang++' || 'g++' }} cmake-args: >- ${{ github.repository == 'zlib-ng/zlib-ng' && '-GNinja -DWITH_SANITIZER=Memory' || '-DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-s390x.cmake -DZLIB_COMPAT=ON' }} -DWITH_DFLTCC_DEFLATE=ON -DWITH_DFLTCC_INFLATE=ON - packages: qemu-user libc-dev-s390x-cross + packages: qemu-user gcc-s390x-linux-gnu g++-s390x-linux-gnu libc-dev-s390x-cross # Coverage disabled, causes MSAN errors - name: Ubuntu MinGW i686 |