diff options
| author |   Richard Henderson <richard.henderson@linaro.org> | 2024-05-06 13:21:36 -0700 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2024-05-06 23:40:36 -0700 |
| commit | f578b66e8c70ddea71d44db6e2c7abbcd757d684 (patch) | |
| tree | 9852d31ea63bcb7f9d65712ef44ee93e1530d5ef | |
| parent | gitlab: Drop --static from s390x linux-user build (diff) | |
| download | qemu-f578b66e8c70ddea71d44db6e2c7abbcd757d684.tar.xz qemu-f578b66e8c70ddea71d44db6e2c7abbcd757d684.zip | |
gitlab: Streamline ubuntu-22.04-s390x
We have one job to build user binaries and one job for system.
Disable tools and docs in the user job, and disable building
the user binaries in the system job.
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
| -rw-r--r-- | .gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml | 6 |
1 files changed, 3 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 0a2d2bd332..25935048e2 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml @@ -15,13 +15,13 @@ ubuntu-22.04-s390x-all-linux: script: - mkdir build - cd build - - ../configure --enable-debug --disable-system + - ../configure --enable-debug --disable-system --disable-tools --disable-docs || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc` - make --output-sync check-tcg - make --output-sync -j`nproc` check -ubuntu-22.04-s390x-all: +ubuntu-22.04-s390x-all-system: extends: .custom_runner_template needs: [] stage: build @@ -35,7 +35,7 @@ ubuntu-22.04-s390x-all: script: - mkdir build - cd build - - ../configure + - ../configure --disable-user || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc` - make --output-sync -j`nproc` check |