From: Ilya Leoshkevich <iii@linux.ibm.com>
Date: Tue, 21 Jul 2020 11:15:23 +0000 (+0200)
Subject: Add DFLTCC to CI
X-Git-Tag: 1.9.9-b1~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a19bbdeec892b1ff8210bd8c3b679cca77ad042d;p=thirdparty%2Fzlib-ng.git

Add DFLTCC to CI

QEMU does not support DFLTCC, but this would still check whether it
builds and gracefully falls back to software.
---

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index ea8ccfb8..d904a376 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -31,6 +31,8 @@ jobs:
           Ubuntu GCC PPC64LE,
           Ubuntu GCC SPARC64,
           Ubuntu GCC S390X,
+          Ubuntu GCC S390X DFLTCC,
+          Ubuntu GCC S390X DFLTCC Compat,
           Ubuntu Clang,
           Ubuntu Clang Inflate Strict,
           Ubuntu Clang Inflate Allow Invalid Dist,
@@ -205,7 +207,23 @@ jobs:
           - name: Ubuntu GCC S390X
             os: ubuntu-latest
             compiler: s390x-linux-gnu-gcc
-            cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-s390x.cmake
+            cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-s390x.cmake -DWITH_SANITIZERS=ON
+            packages: qemu gcc-s390x-linux-gnu libc-dev-s390x-cross
+            ldflags: -static
+            codecov: ubuntu_gcc_s390x
+
+          - name: Ubuntu GCC S390X DFLTCC
+            os: ubuntu-latest
+            compiler: s390x-linux-gnu-gcc
+            cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-s390x.cmake -DWITH_DFLTCC_DEFLATE=ON -DWITH_DFLTCC_INFLATE=ON -DWITH_SANITIZERS=ON
+            packages: qemu gcc-s390x-linux-gnu libc-dev-s390x-cross
+            ldflags: -static
+            codecov: ubuntu_gcc_s390x
+
+          - name: Ubuntu GCC S390X DFLTCC Compat
+            os: ubuntu-latest
+            compiler: s390x-linux-gnu-gcc
+            cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-s390x.cmake -DZLIB_COMPAT=ON -DWITH_DFLTCC_DEFLATE=ON -DWITH_DFLTCC_INFLATE=ON -DWITH_SANITIZERS=ON
             packages: qemu gcc-s390x-linux-gnu libc-dev-s390x-cross
             ldflags: -static
             codecov: ubuntu_gcc_s390x
diff --git a/.github/workflows/configure.yml b/.github/workflows/configure.yml
index 44b684b9..96fd69ef 100644
--- a/.github/workflows/configure.yml
+++ b/.github/workflows/configure.yml
@@ -24,6 +24,9 @@ jobs:
           Ubuntu GCC PPC,
           Ubuntu GCC PPC64,
           Ubuntu GCC PPC64LE,
+          Ubuntu GCC S390X,
+          Ubuntu GCC S390X DFLTCC,
+          Ubuntu GCC S390X DFLTCC Compat,
           macOS GCC
         ]
         include:
@@ -139,6 +142,33 @@ jobs:
             chost: powerpc64le-linux-gnu
             packages: qemu gcc-powerpc64le-linux-gnu libc-dev-ppc64el-cross
 
+          - name: Ubuntu GCC S390X
+            os: ubuntu-latest
+            compiler: s390x-linux-gnu-gcc
+            configure-args: --warn --static
+            chost: s390x-linux-gnu
+            packages: qemu gcc-s390x-linux-gnu libc-dev-s390x-cross
+            cflags: -static
+            ldflags: -static
+
+          - name: Ubuntu GCC S390X DFLTCC
+            os: ubuntu-latest
+            compiler: s390x-linux-gnu-gcc
+            configure-args: --warn --static --with-dfltcc-deflate --with-dfltcc-inflate
+            chost: s390x-linux-gnu
+            packages: qemu gcc-s390x-linux-gnu libc-dev-s390x-cross
+            cflags: -static
+            ldflags: -static
+
+          - name: Ubuntu GCC S390X DFLTCC Compat
+            os: ubuntu-latest
+            compiler: s390x-linux-gnu-gcc
+            configure-args: --warn --zlib-compat --static --with-dfltcc-deflate --with-dfltcc-inflate
+            chost: s390x-linux-gnu
+            packages: qemu gcc-s390x-linux-gnu libc-dev-s390x-cross
+            cflags: -static
+            ldflags: -static
+
           - name: macOS GCC
             os: macOS-latest
             compiler: gcc