diff options
| author | Andrei Karas <akaras@inbox.ru> | 2019-03-24 06:43:01 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2019-03-24 06:43:01 +0300 |
| commit | 690adf11698d656acbe13caed9675993f6516365 (patch) | |
| tree | acfb65ace5c68cab4b7cb2ffc1f516843809c0b5 /tools/ci | |
| parent | f384a510684ed44bfd9d470b77c4c7349d32aa98 (diff) | |
| download | manaplus-690adf11698d656acbe13caed9675993f6516365.tar.gz manaplus-690adf11698d656acbe13caed9675993f6516365.tar.bz2 manaplus-690adf11698d656acbe13caed9675993f6516365.tar.xz manaplus-690adf11698d656acbe13caed9675993f6516365.zip | |
Disable clang 3.0 and switch old gcc to ubuntu trusty
Diffstat (limited to 'tools/ci')
| -rw-r--r-- | tools/ci/branches/ci_clang3x/.gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | tools/ci/branches/ci_gcc4x/.gitlab-ci.yml | 12 |
2 files changed, 10 insertions, 8 deletions
diff --git a/tools/ci/branches/ci_clang3x/.gitlab-ci.yml b/tools/ci/branches/ci_clang3x/.gitlab-ci.yml index cb44bfa71..f2a82d762 100644 --- a/tools/ci/branches/ci_clang3x/.gitlab-ci.yml +++ b/tools/ci/branches/ci_clang3x/.gitlab-ci.yml @@ -28,7 +28,8 @@ clang-3.9: libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev git gdb valgrind netcat-openbsd procps -clang-3.0: +# was removed from debian and ubuntu +.clang-3.0: stage: build script: - ./tools/ci/jobs/clang.sh clang @@ -44,7 +45,8 @@ clang-3.0: tags: - docker -clang-3.0_i386: +# was removed from debian and ubuntu +.clang-3.0_i386: stage: build script: - ./tools/ci/jobs/clang.sh clang diff --git a/tools/ci/branches/ci_gcc4x/.gitlab-ci.yml b/tools/ci/branches/ci_gcc4x/.gitlab-ci.yml index 84998670f..14bb9425e 100644 --- a/tools/ci/branches/ci_gcc4x/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc4x/.gitlab-ci.yml @@ -20,7 +20,7 @@ gcc-4.4: - ./tools/ci/jobs/gcc44.sh - ./tools/ci/scripts/runtests.sh - ./tools/ci/scripts/rundyecmd.sh - image: debian:wheezy + image: ubuntu:trusty <<: *job-push variables: PACKAGES: git gcc-4.4 g++-4.4 @@ -101,7 +101,7 @@ gcc-4.4_i386: - ./tools/ci/jobs/gcc44.sh - ./tools/ci/scripts/runtests.sh - ./tools/ci/scripts/rundyecmd.sh - image: vicamo/debian:wheezy-i386 + image: i386/ubuntu:trusty <<: *job-push variables: PACKAGES: git gcc-4.4 g++-4.4 @@ -135,7 +135,7 @@ gcc-4.6: - ./tools/ci/jobs/gcc46.sh - ./tools/ci/scripts/runtests.sh - ./tools/ci/scripts/rundyecmd.sh - image: debian:wheezy + image: ubuntu:trusty <<: *job-push variables: PACKAGES: git gcc-4.6 g++-4.6 @@ -152,7 +152,7 @@ gcc-4.6_i386: - ./tools/ci/jobs/gcc46.sh - ./tools/ci/scripts/runtests.sh - ./tools/ci/scripts/rundyecmd.sh - image: vicamo/debian:wheezy-i386 + image: i386/ubuntu:trusty <<: *job-push variables: PACKAGES: git gcc-4.6 g++-4.6 @@ -172,7 +172,7 @@ gcc-4.7: - ./tools/ci/jobs/gcc47_c++11.sh - ./tools/ci/scripts/runtests.sh - ./tools/ci/scripts/rundyecmd.sh - image: debian:wheezy + image: ubuntu:trusty <<: *job-push variables: PACKAGES: git gcc-4.7 g++-4.7 @@ -189,7 +189,7 @@ gcc-4.7_i386: - ./tools/ci/jobs/gcc47.sh - ./tools/ci/scripts/runtests.sh - ./tools/ci/scripts/rundyecmd.sh - image: vicamo/debian:wheezy-i386 + image: i386/ubuntu:trusty <<: *job-push variables: PACKAGES: git gcc-4.7 g++-4.7 |