From: Thomas Weißschuh Date: Fri, 7 Oct 2022 22:47:01 +0000 (+0200) Subject: Run Ci on big-endian s390x X-Git-Tag: v2.39-rc1~474^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=08aa967520de97d8ad577f3ca87bf951cabd6fe6;p=thirdparty%2Futil-linux.git Run Ci on big-endian s390x Fixes #1808 --- diff --git a/.github/workflows/cibuild-setup-ubuntu.sh b/.github/workflows/cibuild-setup-ubuntu.sh index 3a54889049..07b5282bae 100755 --- a/.github/workflows/cibuild-setup-ubuntu.sh +++ b/.github/workflows/cibuild-setup-ubuntu.sh @@ -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)" diff --git a/.github/workflows/cibuild.sh b/.github/workflows/cibuild.sh index 9a67d69ae3..76bfbf2d57 100755 --- a/.github/workflows/cibuild.sh +++ b/.github/workflows/cibuild.sh @@ -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[@]}" diff --git a/.github/workflows/cibuild.yml b/.github/workflows/cibuild.yml index dc10ad4c41..66a6cb9105 100644 --- a/.github/workflows/cibuild.yml +++ b/.github/workflows/cibuild.yml @@ -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