| Message ID | 20240506202341.422814-1-richard.henderson@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | gitlab: Rename ubuntu-22.04-s390x-all to *-system | expand |
On 6/5/24 22:23, Richard Henderson wrote: > We already build the linux-user binaries with > ubuntu-22.04-s390x-all-linux, so there's no need to do it again. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > .gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
On 06/05/2024 22.23, Richard Henderson wrote: > We already build the linux-user binaries with > ubuntu-22.04-s390x-all-linux, so there's no need to do it again. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > .gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml | 4 ++-- > 1 file changed, 2 insertions(+), 2 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 3a2b1e1d24..c3f16d77bb 100644 > --- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml > +++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml > @@ -21,7 +21,7 @@ ubuntu-22.04-s390x-all-linux: > - 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 --disable-libssh > + - ../configure --disable-libssh --disable-user While you're at it, you could also drop the --disable-libssh now (it was a work-around for a bug in Ubuntu 18.04 IIRC). Reviewed-by: Thomas Huth <thuth@redhat.com>
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 3a2b1e1d24..c3f16d77bb 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml @@ -21,7 +21,7 @@ ubuntu-22.04-s390x-all-linux: - 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 --disable-libssh + - ../configure --disable-libssh --disable-user || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc` - make --output-sync -j`nproc` check
We already build the linux-user binaries with ubuntu-22.04-s390x-all-linux, so there's no need to do it again. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- .gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)