From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Sun, 14 Jan 2024 04:28:38 +0000 (-0800)
Subject: Fixed S390X configure builds not running in forks.
X-Git-Tag: 2.2.0~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9f16481a67a4c620cbd306a798dcc7ec2e3345b;p=thirdparty%2Fzlib-ng.git

Fixed S390X configure builds not running in forks.
---

diff --git a/.github/workflows/configure.yml b/.github/workflows/configure.yml
index 9d870ce2..15b0189c 100644
--- a/.github/workflows/configure.yml
+++ b/.github/workflows/configure.yml
@@ -168,14 +168,22 @@ jobs:
             ldflags: -static
 
           - name: Ubuntu GCC S390X DFLTCC
-            os: z15
-            compiler: gcc
+            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
+            chost: ${{ github.repository != 'zlib-ng/zlib-ng' &&  's390x-linux-gnu' || '' }}
+            packages: ${{ github.repository != 'zlib-ng/zlib-ng' && 'qemu qemu-user gcc-s390x-linux-gnu g++-s390x-linux-gnu libc-dev-s390x-cross' || '' }}
+            cflags: ${{ github.repository != 'zlib-ng/zlib-ng' && '-static' || '' }}
+            ldflags: ${{ github.repository != 'zlib-ng/zlib-ng' && '-static' || '' }}
 
           - name: Ubuntu GCC S390X DFLTCC Compat
-            os: z15
-            compiler: gcc
+            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
+            chost: ${{ github.repository != 'zlib-ng/zlib-ng' &&  's390x-linux-gnu' || '' }}
+            packages: ${{ github.repository != 'zlib-ng/zlib-ng' && 'qemu qemu-user gcc-s390x-linux-gnu g++-s390x-linux-gnu libc-dev-s390x-cross' || '' }}
+            cflags: ${{ github.repository != 'zlib-ng/zlib-ng' && '-static' || '' }}
+            ldflags: ${{ github.repository != 'zlib-ng/zlib-ng' && '-static' || '' }}
 
           - name: Ubuntu Emscripten WASM32
             os: ubuntu-latest
@@ -209,8 +217,8 @@ jobs:
 
     - name: Add ubuntu mirrors
       if: runner.os == 'Linux' && matrix.packages
+      # Github Actions caching proxy is at times unreliable
       run: |
-        # Github Actions caching proxy is at times unreliable
         echo -e 'http://azure.archive.ubuntu.com/ubuntu\tpriority:1\n' | sudo tee /etc/apt/mirrors.txt
         curl http://mirrors.ubuntu.com/mirrors.txt | sudo tee --append /etc/apt/mirrors.txt
         sudo sed -i 's#http://azure.archive.ubuntu.com/ubuntu/#mirror+file:/etc/apt/mirrors.txt#' /etc/apt/sources.list