summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-11-05 03:05:00 +0300
committerAndrei Karas <akaras@inbox.ru>2018-11-12 02:02:30 +0300
commitc3b5c3ad370358d4e10b4cbe787dbbd61ce82c08 (patch)
treea6cd6bef82735b028480a0a1c5a5434f63bcd6a5
parent3e6ea8eeb0fb6cc72c2d4aaaf20e5633847e3737 (diff)
downloadmv-c3b5c3ad370358d4e10b4cbe787dbbd61ce82c08.tar.gz
mv-c3b5c3ad370358d4e10b4cbe787dbbd61ce82c08.tar.bz2
mv-c3b5c3ad370358d4e10b4cbe787dbbd61ce82c08.tar.xz
mv-c3b5c3ad370358d4e10b4cbe787dbbd61ce82c08.zip
Change images for clang compiler ci jobs.
-rw-r--r--.gitlab-ci.yml1
-rw-r--r--tools/ci/branches/ci_clang3x/.gitlab-ci.yml7
-rw-r--r--tools/ci/branches/ci_clang4_5/.gitlab-ci.yml3
3 files changed, 8 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 600d6793d..8e4d39704 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -98,6 +98,7 @@ clang-3.9:
- ./tools/ci/jobs/clang39.sh
- ./tools/ci/scripts/runtests.sh
- ./tools/ci/scripts/rundyecmd.sh
+ image: debian:stretch
<<: *job-push
variables:
PACKAGES: clang-3.9 libc++-dev libc++abi-dev
diff --git a/tools/ci/branches/ci_clang3x/.gitlab-ci.yml b/tools/ci/branches/ci_clang3x/.gitlab-ci.yml
index da743ef54..cb44bfa71 100644
--- a/tools/ci/branches/ci_clang3x/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_clang3x/.gitlab-ci.yml
@@ -19,6 +19,7 @@ clang-3.9:
script:
- ./tools/ci/jobs/clang39.sh
- ./tools/ci/scripts/runtests.sh
+ image: debian:stretch
<<: *job-push
variables:
PACKAGES: gcc g++ clang-3.9 libc++-dev libc++abi-dev
@@ -126,7 +127,7 @@ clang-3.5:
script:
- ./tools/ci/jobs/clang35.sh
- ./tools/ci/scripts/runtests.sh
- image: debian:jessie
+ image: debian:jessie-backports
<<: *job-push
variables:
PACKAGES: clang-3.5 libc++-dev
@@ -140,7 +141,7 @@ clang-3.5_i386:
script:
- ./tools/ci/jobs/clang35.sh
- ./tools/ci/scripts/runtests.sh
- image: vicamo/debian:jessie-i386
+ image: i386/debian:jessie-backports
<<: *job-push
variables:
PACKAGES: clang-3.5 libc++-dev
@@ -252,6 +253,7 @@ clang-3.8_i386:
script:
- ./tools/ci/jobs/clang39.sh_c++11.sh
- ./tools/ci/scripts/runtests.sh
+ image: debian:stretch
<<: *job-push
variables:
PACKAGES: clang-3.9 libc++-dev libc++abi-dev
@@ -282,6 +284,7 @@ clang-3.9_sdl2:
- ./tools/ci/jobs/clang39_sdl2.sh
- ./tools/ci/scripts/runtests.sh
- ./tools/ci/scripts/rundyecmd.sh
+ image: debian:stretch
<<: *job-push
variables:
PACKAGES: gcc g++ clang-3.9 libc++-dev libc++abi-dev
diff --git a/tools/ci/branches/ci_clang4_5/.gitlab-ci.yml b/tools/ci/branches/ci_clang4_5/.gitlab-ci.yml
index 96ceb3728..23b8687fd 100644
--- a/tools/ci/branches/ci_clang4_5/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_clang4_5/.gitlab-ci.yml
@@ -22,6 +22,7 @@ clang-4.0:
- ./tools/ci/jobs/clang40.sh
- ./tools/ci/scripts/runtests.sh
<<: *job-push
+ image: debian:stretch-backports
variables:
PACKAGES: clang-4.0 libc++-dev libc++abi-dev
make autoconf automake autopoint gettext
@@ -37,7 +38,7 @@ clang-5.0:
- ./tools/ci/jobs/clang50.sh
- ./tools/ci/scripts/runtests.sh
<<: *job-push
- image: stretch-backports
+ image: debian:stretch-backports
variables:
PACKAGES: clang-5.0 libc++-dev libc++abi-dev libclang-5.0-dev
make autoconf automake autopoint gettext