summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2019-10-11 22:09:54 +0300
committerAndrei Karas <akaras@inbox.ru>2019-10-11 22:41:36 +0300
commitb95b9743ae9fc0944624bf193f890b81be6aa210 (patch)
tree41709ed57f5acb4f23fb62e58827026cb5391a35
parenta77e03453369d8341e2f44c83246158aff7a110f (diff)
downloadplus-b95b9743ae9fc0944624bf193f890b81be6aa210.tar.gz
plus-b95b9743ae9fc0944624bf193f890b81be6aa210.tar.bz2
plus-b95b9743ae9fc0944624bf193f890b81be6aa210.tar.xz
plus-b95b9743ae9fc0944624bf193f890b81be6aa210.zip
Switch from unstable to stable in clang-7 builds
In unstable clang-7 or/and libc++ is broken.
-rw-r--r--tools/ci/branches/ci_clang7/.gitlab-ci.yml12
-rw-r--r--tools/ci/branches/ci_glibcdebug/.gitlab-ci.yml4
2 files changed, 12 insertions, 4 deletions
diff --git a/tools/ci/branches/ci_clang7/.gitlab-ci.yml b/tools/ci/branches/ci_clang7/.gitlab-ci.yml
index 6b46e9fb1..43f81a911 100644
--- a/tools/ci/branches/ci_clang7/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_clang7/.gitlab-ci.yml
@@ -20,6 +20,7 @@ clang-7.0_tests:
- ./tools/ci/scripts/patchsdl1.sh
- ./tools/ci/jobs/clang70_tests.sh --without-dyecmd --without-manaplusgame
<<: *job-push
+ image: debian:buster
variables:
PACKAGES: clang-7 libc++-dev libc++abi-dev libclang-7-dev
make autoconf automake autopoint gettext
@@ -35,7 +36,7 @@ clang-7.0_tests_i386:
- ./tools/ci/scripts/patchsdl1.sh
- ./tools/ci/jobs/clang70_tests.sh --without-dyecmd --without-manaplusgame
<<: *job-push
- image: vicamo/debian:sid-i386
+ image: i386/debian:buster
variables:
PACKAGES: clang-7 libc++-dev libc++abi-dev libclang-7-dev
make autoconf automake autopoint gettext
@@ -50,6 +51,7 @@ clang-7.0_tests_sdl2:
script:
- ./tools/ci/jobs/clang70_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame
<<: *job-push
+ image: debian:buster
variables:
PACKAGES: clang-7 libc++-dev libc++abi-dev libclang-7-dev
make autoconf automake autopoint gettext
@@ -64,7 +66,7 @@ clang-7.0_tests_sdl2_i386:
script:
- ./tools/ci/jobs/clang70_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame
<<: *job-push
- image: vicamo/debian:sid-i386
+ image: i386/debian:buster
variables:
PACKAGES: clang-7 libc++-dev libc++abi-dev libclang-7-dev
make autoconf automake autopoint gettext
@@ -81,6 +83,7 @@ clang-7.0:
- ./tools/ci/jobs/clang70.sh
- ./tools/ci/scripts/runtests.sh
<<: *job-push
+ image: debian:buster
variables:
PACKAGES: clang-7 libc++-dev libc++abi-dev libclang-7-dev
make autoconf automake autopoint gettext
@@ -97,7 +100,7 @@ clang-7.0_i386:
- ./tools/ci/jobs/clang70.sh
- ./tools/ci/scripts/runtests.sh
<<: *job-push
- image: vicamo/debian:sid-i386
+ image: i386/debian:buster
variables:
PACKAGES: clang-7 libc++-dev libc++abi-dev libclang-7-dev
make autoconf automake autopoint gettext
@@ -113,6 +116,7 @@ clang-7.0_sdl2:
- ./tools/ci/jobs/clang70.sh --with-sdl2
- ./tools/ci/scripts/runtests.sh
<<: *job-push
+ image: debian:buster
variables:
PACKAGES: clang-7 libc++-dev libc++abi-dev libclang-7-dev
make autoconf automake autopoint gettext
@@ -128,7 +132,7 @@ clang-7.0_sdl2_i386:
- ./tools/ci/jobs/clang70.sh --with-sdl2
- ./tools/ci/scripts/runtests.sh
<<: *job-push
- image: vicamo/debian:sid-i386
+ image: i386/debian:buster
variables:
PACKAGES: clang-7 libc++-dev libc++abi-dev libclang-7-dev
make autoconf automake autopoint gettext
diff --git a/tools/ci/branches/ci_glibcdebug/.gitlab-ci.yml b/tools/ci/branches/ci_glibcdebug/.gitlab-ci.yml
index 4b079a1bc..de558aba1 100644
--- a/tools/ci/branches/ci_glibcdebug/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_glibcdebug/.gitlab-ci.yml
@@ -95,6 +95,7 @@ clang-7.0_glibcdebug_tests:
- ./tools/ci/scripts/patchsdl1.sh
- ./tools/ci/jobs/clang70_tests.sh --without-dyecmd --without-manaplusgame --enable-glibcdebug
<<: *job-push
+ image: debian:buster
variables:
PACKAGES: clang-7 libc++-dev libc++abi-dev libclang-7-dev
make autoconf automake autopoint gettext
@@ -109,6 +110,7 @@ clang-7.0_glibcdebug_tests_sdl2:
script:
- ./tools/ci/jobs/clang70_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame --enable-glibcdebug
<<: *job-push
+ image: debian:buster
variables:
PACKAGES: clang-7 libc++-dev libc++abi-dev libclang-7-dev
make autoconf automake autopoint gettext
@@ -125,6 +127,7 @@ clang-7.0_glibcdebug:
- ./tools/ci/jobs/clang70.sh --enable-glibcdebug
- ./tools/ci/scripts/runtests.sh
<<: *job-push
+ image: debian:buster
variables:
PACKAGES: clang-7 libc++-dev libc++abi-dev libclang-7-dev
make autoconf automake autopoint gettext
@@ -140,6 +143,7 @@ clang-7.0_glibcdebug_sdl2:
- ./tools/ci/jobs/clang70.sh --with-sdl2 --enable-glibcdebug
- ./tools/ci/scripts/runtests.sh
<<: *job-push
+ image: debian:buster
variables:
PACKAGES: clang-7 libc++-dev libc++abi-dev libclang-7-dev
make autoconf automake autopoint gettext