diff options
| author | Alex Bennée <alex.bennee@linaro.org> | 2024-04-26 16:39:38 +0100 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2024-04-30 06:21:47 +0200 |
| commit | 39ad72c2600af53d7697413afac382562910d3f8 (patch) | |
| tree | b39a07ec926da2ff55a0cbc8e636ee8f2c08d47f /.gitlab-ci.d/custom-runners | |
| parent | 108d99742af1fa6e977dcfac9d4151b7915e33a3 (diff) | |
| download | qemu-39ad72c2600af53d7697413afac382562910d3f8.zip qemu-39ad72c2600af53d7697413afac382562910d3f8.tar.gz qemu-39ad72c2600af53d7697413afac382562910d3f8.tar.bz2 | |
gitlab: remove stale s390x-all-linux-static conf hacks
The libssh bug references 18.04 which we are no longer running. We
don't need to disable glusterfs because a linux-user build shouldn't
be trying to link to it anyway.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20240426153938.1707723-4-alex.bennee@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to '.gitlab-ci.d/custom-runners')
| -rw-r--r-- | .gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml b/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml index 85e2809..1059818 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml @@ -13,11 +13,9 @@ ubuntu-22.04-s390x-all-linux-static: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: "$S390X_RUNNER_AVAILABLE" script: - # --disable-libssh is needed because of https://bugs.launchpad.net/qemu/+bug/1838763 - # --disable-glusterfs is needed because there's no static version of those libs in distro supplied packages - mkdir build - cd build - - ../configure --enable-debug --static --disable-system --disable-glusterfs --disable-libssh + - ../configure --enable-debug --static --disable-system || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc` - make --output-sync check-tcg |