From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Mon, 22 Aug 2022 00:48:25 +0000 (-0700)
Subject: Remove unused qemu-run variable from configure workflow matrix.
X-Git-Tag: 2.1.0-beta1~132
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebba7d7bfead92d52464b586f81e269a8d495d3d;p=thirdparty%2Fzlib-ng.git

Remove unused qemu-run variable from configure workflow matrix.

The configure script automatically determines this with variable QEMU_ARCH.
---

diff --git a/.github/workflows/configure.yml b/.github/workflows/configure.yml
index 4c0d395d7..babdbe617 100644
--- a/.github/workflows/configure.yml
+++ b/.github/workflows/configure.yml
@@ -36,7 +36,6 @@ jobs:
             configure-args: --warn
             chost: arm-linux-gnueabi
             packages: qemu qemu-user gcc-arm-linux-gnueabi libc-dev-armel-cross
-            qemu-run: qemu-arm
 
           - name: Ubuntu GCC ARM SF Compat No Opt
             os: ubuntu-latest
@@ -44,7 +43,6 @@ jobs:
             configure-args: --warn --zlib-compat --without-optimizations --without-new-strategies
             chost: arm-linux-gnueabi
             packages: qemu qemu-user gcc-arm-linux-gnueabi libc-dev-armel-cross
-            qemu-run: qemu-arm
 
           - name: Ubuntu GCC ARM HF
             os: ubuntu-latest
@@ -52,7 +50,6 @@ jobs:
             configure-args: --warn
             chost: arm-linux-gnueabihf
             packages: qemu qemu-user gcc-arm-linux-gnueabihf libc-dev-armel-cross
-            qemu-run: qemu-arm
 
           - name: Ubuntu GCC ARM HF No ACLE
             os: ubuntu-latest
@@ -60,7 +57,6 @@ jobs:
             configure-args: --warn --without-acle
             chost: arm-linux-gnueabihf
             packages: qemu qemu-user gcc-arm-linux-gnueabihf libc-dev-armel-cross
-            qemu-run: qemu-arm
 
           - name: Ubuntu GCC ARM HF No NEON
             os: ubuntu-latest
@@ -68,7 +64,6 @@ jobs:
             configure-args: --warn --without-neon
             chost: arm-linux-gnueabihf
             packages: qemu qemu-user gcc-arm-linux-gnueabihf libc-dev-armel-cross
-            qemu-run: qemu-arm
 
           - name: Ubuntu GCC ARM HF Compat No Opt
             os: ubuntu-latest
@@ -76,7 +71,6 @@ jobs:
             configure-args: --warn --zlib-compat --without-optimizations --without-new-strategies
             chost: arm-linux-gnueabihf
             packages: qemu qemu-user gcc-arm-linux-gnueabihf libc-dev-armel-cross
-            qemu-run: qemu-arm
 
           - name: Ubuntu GCC AARCH64
             os: ubuntu-latest
@@ -84,7 +78,6 @@ jobs:
             configure-args: --warn
             chost: aarch64-linux-gnu
             packages: qemu qemu-user gcc-aarch64-linux-gnu libc-dev-arm64-cross
-            qemu-run: qemu-aarch64
 
           - name: Ubuntu GCC AARCH64 No ACLE
             os: ubuntu-latest
@@ -92,7 +85,6 @@ jobs:
             configure-args: --warn --without-acle
             chost: aarch64-linux-gnu
             packages: qemu qemu-user gcc-aarch64-linux-gnu libc-dev-arm64-cross
-            qemu-run: qemu-aarch64
 
           - name: Ubuntu GCC AARCH64 No NEON
             os: ubuntu-latest
@@ -100,7 +92,6 @@ jobs:
             configure-args: --warn --without-neon
             chost: aarch64-linux-gnu
             packages: qemu qemu-user gcc-aarch64-linux-gnu libc-dev-arm64-cross
-            qemu-run: qemu-aarch64
 
           - name: Ubuntu GCC AARCH64 Compat No Opt
             os: ubuntu-latest
@@ -108,7 +99,6 @@ jobs:
             configure-args: --warn --zlib-compat --without-optimizations --without-new-strategies
             chost: aarch64-linux-gnu
             packages: qemu qemu-user gcc-aarch64-linux-gnu libc-dev-arm64-cross
-            qemu-run: qemu-aarch64
 
           - name: Ubuntu GCC PPC
             os: ubuntu-latest
@@ -116,7 +106,6 @@ jobs:
             configure-args: --warn --static
             chost: powerpc-linux-gnu
             packages: qemu qemu-user gcc-powerpc-linux-gnu libc-dev-powerpc-cross
-            qemu-run: qemu-ppc
             cflags: -static
             ldflags: -static
 
@@ -126,7 +115,6 @@ jobs:
             configure-args: --warn --without-power8
             chost: powerpc-linux-gnu
             packages: qemu qemu-user gcc-powerpc-linux-gnu libc-dev-powerpc-cross
-            qemu-run: qemu-ppc
 
           - name: Ubuntu GCC PPC64
             os: ubuntu-latest
@@ -134,7 +122,6 @@ jobs:
             configure-args: --warn --static
             chost: powerpc-linux-gnu
             packages: qemu qemu-user gcc-powerpc64-linux-gnu libc-dev-ppc64-cross
-            qemu-run: qemu-ppc64
             cflags: -static
             ldflags: -static
 
@@ -144,7 +131,6 @@ jobs:
             configure-args: --warn
             chost: powerpc64le-linux-gnu
             packages: qemu qemu-user gcc-powerpc64le-linux-gnu libc-dev-ppc64el-cross
-            qemu-run: qemu-ppc64le
 
           - name: Ubuntu GCC S390X
             os: ubuntu-latest
@@ -152,7 +138,6 @@ jobs:
             configure-args: --warn --static
             chost: s390x-linux-gnu
             packages: qemu qemu-user gcc-s390x-linux-gnu libc-dev-s390x-cross
-            qemu-run: qemu-s390x
             cflags: -static
             ldflags: -static
 
@@ -162,7 +147,6 @@ jobs:
             configure-args: --warn --static --without-crc32-vx
             chost: s390x-linux-gnu
             packages: qemu qemu-user gcc-s390x-linux-gnu libc-dev-s390x-cross
-            qemu-run: qemu-s390x
             cflags: -static
             ldflags: -static
 
@@ -220,8 +204,6 @@ jobs:
     - name: Run test cases
       run: make test
       working-directory: ${{ matrix.build-dir }}
-      env:
-        QEMU_RUN: ${{ matrix.qemu-run }}
 
     - name: Upload build errors
       uses: actions/upload-artifact@v2