From d01bc2531c4055ca8b5c3a0cacb9e26d321550c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Sun, 8 Nov 2020 21:45:28 +0100 Subject: [PATCH] gitlab-ci: Move user-static test across to gitlab MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Similarly to commit 8cdb2cef3f1, move the user-static test to GitLab. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20201108204535.2319870-11-philmd@redhat.com> Reviewed-by: Wainer dos Santos Moschetta Signed-off-by: Thomas Huth --- .gitlab-ci.yml | 7 +++++++ .travis.yml | 5 ----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8f72a2630d..7381c7858d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -304,6 +304,13 @@ build-user: CONFIGURE_ARGS: --disable-tools --disable-system MAKE_CHECK_ARGS: check-tcg +build-user-static: + <<: *native_build_job_definition + variables: + IMAGE: debian-all-test-cross + CONFIGURE_ARGS: --disable-tools --disable-system --static + MAKE_CHECK_ARGS: check-tcg + # Only build the softmmu targets we have check-tcg tests for build-some-softmmu: <<: *native_build_job_definition diff --git a/.travis.yml b/.travis.yml index 1f80bdb624..12828f351c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -119,11 +119,6 @@ after_script: jobs: include: - - name: "GCC static (user)" - env: - - CONFIG="--disable-system --static" - - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" - # Just build tools and run minimal unit and softfloat checks - name: "GCC check-unit and check-softfloat" env: