summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé2020-11-08 21:45:28 +0100
committerThomas Huth2020-12-09 08:04:34 +0100
commitd01bc2531c4055ca8b5c3a0cacb9e26d321550c7 (patch)
tree4e53db7c1aa60749164255760af38f25d135f2ae
parentgitlab-ci: Update 'build-disabled' to cover all configurable options (diff)
downloadqemu-d01bc2531c4055ca8b5c3a0cacb9e26d321550c7.tar.gz
qemu-d01bc2531c4055ca8b5c3a0cacb9e26d321550c7.tar.xz
qemu-d01bc2531c4055ca8b5c3a0cacb9e26d321550c7.zip
gitlab-ci: Move user-static test across to gitlab
Similarly to commit 8cdb2cef3f1, move the user-static test to GitLab. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20201108204535.2319870-11-philmd@redhat.com> Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
-rw-r--r--.gitlab-ci.yml7
-rw-r--r--.travis.yml5
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: