From: Karel Zak <kzak@redhat.com>
Date: Tue, 25 Apr 2023 10:08:30 +0000 (+0200)
Subject: Revert "ci: (s390x/qemu-user) speed up build preparation"
X-Git-Tag: v2.39~58
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=33cc9f6de3cec880e75c95ef5bcd5ae99a640199;p=thirdparty%2Futil-linux.git

Revert "ci: (s390x/qemu-user) speed up build preparation"

This reverts commit 006275ac911e393b5ab6ace921c3b3bb206d6cb0.

Addresses: https://github.com/util-linux/util-linux/pull/2198
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/.github/workflows/cibuild.yml b/.github/workflows/cibuild.yml
index 419599644b..8cfa6e0c6d 100644
--- a/.github/workflows/cibuild.yml
+++ b/.github/workflows/cibuild.yml
@@ -111,16 +111,14 @@ jobs:
         with:
           arch: s390x
           distro: ubuntu_latest
-          githubToken: "${{ github.token }}"
-          env: |
-            COMPILER: gcc
-            COMPILER_VERSION: 10
-            SANITIZE: no
-            QEMU_USER: 1
-          install: |
+          run: |
+            export COMPILER=gcc
+            export COMPILER_VERSION=10
+            export SANITIZE=no
+            export QEMU_USER=1
+
             # name: Ubuntu setup
             .github/workflows/cibuild-setup-ubuntu.sh
-          run: |
             git config --global --add safe.directory "$PWD"
             # Configure & Make
             .github/workflows/cibuild.sh CONFIGURE MAKE