]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
Run Ci on big-endian s390x
authorThomas Weißschuh <thomas@t-8ch.de>
Fri, 7 Oct 2022 22:47:01 +0000 (00:47 +0200)
committerThomas Weißschuh <thomas@t-8ch.de>
Mon, 17 Oct 2022 22:00:20 +0000 (00:00 +0200)
Fixes #1808

.github/workflows/cibuild-setup-ubuntu.sh
.github/workflows/cibuild.sh
.github/workflows/cibuild.yml

index 3a54889049eb19f769a2865579ba828e26f72819..07b5282baec053d6c7cac7a1103e0749b78d6b32 100755 (executable)
@@ -27,7 +27,9 @@ PACKAGES_OPTIONAL=(
 )
 
 # scsi_debug
-PACKAGES+=(linux-modules-extra-$(uname -r))
+if [[ "$QEMU_USER" != "1" ]]; then
+       PACKAGES+=(linux-modules-extra-$(uname -r))
+fi
 
 COMPILER="${COMPILER:?}"
 RELEASE="$(lsb_release -cs)"
index 9a67d69ae359fcbf9df6c3ff29548bd2cb141f72..76bfbf2d57cf10a6c8f668c426cfb5aa4e907f2d 100755 (executable)
@@ -105,7 +105,7 @@ for phase in "${PHASES[@]}"; do
             CXXFLAGS+=(-shared-libasan)
         fi
 
-        sudo -E git clean -xdf
+        git clean -xdf
 
         ./autogen.sh
         CC="$CC" CXX="$CXX" CFLAGS="${CFLAGS[@]}" CXXFLAGS="${CXXFLAGS[@]}" LDFLAGS="${LDFLAGS[@]}" ./configure "${opts[@]}"
index dc10ad4c41736b78c61374f52c249e3356902e74..66a6cb9105d4b00abdd3509af444754250c2595e 100644 (file)
@@ -98,3 +98,29 @@ jobs:
         run: .github/workflows/cibuild.sh CONFIGURE
       - name: Make distcheck
         run: .github/workflows/cibuild.sh DISTCHECK
+  build-s390x:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Repository checkout
+        uses: actions/checkout@v1
+      - uses: uraimo/run-on-arch-action@v2
+        with:
+          arch: s390x
+          distro: ubuntu_latest
+          run: |
+            export COMPILER=gcc
+            export COMPILER_VERSION=10
+            export SANITIZE=no
+            export QEMU_USER=1
+
+            apt-get update
+            apt-get install -y --no-install-recommends lsb-release software-properties-common gpg-agent git
+
+            git config --global --add safe.directory "$PWD"
+
+            # name: Ubuntu setup
+            .github/workflows/cibuild-setup-ubuntu.sh
+            # Configure & Make
+            .github/workflows/cibuild.sh CONFIGURE MAKE
+            # Check
+            .github/workflows/cibuild.sh CHECK