diff options
Diffstat (limited to 'tools/ci/branches/ci_gcc5/.gitlab-ci.yml')
| -rw-r--r-- | tools/ci/branches/ci_gcc5/.gitlab-ci.yml | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/tools/ci/branches/ci_gcc5/.gitlab-ci.yml b/tools/ci/branches/ci_gcc5/.gitlab-ci.yml index 468468ec8..a7fc0c0f7 100644 --- a/tools/ci/branches/ci_gcc5/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc5/.gitlab-ci.yml @@ -22,7 +22,7 @@ gcc-5_c++11_i386: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc5_c++11.sh - ./tools/ci/scripts/runtests.sh - image: vicamo/debian:sid-i386 + image: i386/ubuntu:cosmic <<: *job-push variables: PACKAGES: gcc-5 g++-5 @@ -40,6 +40,7 @@ gcc-5_sdl2: - ./tools/ci/scripts/runtests.sh - ./tools/ci/jobs/gcc5_sdl2_c++11.sh - ./tools/ci/scripts/runtests.sh + image: ubuntu:cosmic <<: *job-push variables: PACKAGES: gcc-5 g++-5 @@ -54,6 +55,7 @@ gcc-5_sanitize_tests: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc5_sanitize_tests.sh - ldd ./src/manaplustests | grep "libasan" + image: ubuntu:cosmic <<: *job-push variables: PACKAGES: gcc-5 g++-5 @@ -71,7 +73,7 @@ gcc-5_sanitize_tests: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc5_sanitize_tests.sh --without-dyecmd --without-manaplusgame - ldd ./src/manaplustests | grep "libasan" - image: vicamo/debian:sid-i386 + image: i386/ubuntu:cosmic <<: *job-push variables: PACKAGES: gcc-5 g++-5 @@ -88,6 +90,7 @@ gcc-5_sanitize_no_opengl_tests: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc5_sanitize_tests.sh --without-opengl --without-dyecmd --without-manaplusgame - ldd ./src/manaplustests | grep "libasan" + image: ubuntu:cosmic <<: *job-push variables: PACKAGES: gcc-5 g++-5 @@ -105,7 +108,7 @@ gcc-5_sanitize_no_opengl_tests: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc5_sanitize_tests.sh --without-opengl --without-dyecmd --without-manaplusgame - ldd ./src/manaplustests | grep "libasan" - image: vicamo/debian:sid-i386 + image: i386/ubuntu:cosmic <<: *job-push variables: PACKAGES: gcc-5 g++-5 @@ -122,6 +125,7 @@ gcc-5_sanitize: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc5_sanitize.sh - ./tools/ci/scripts/runtests.sh + image: ubuntu:cosmic <<: *job-push variables: PACKAGES: gcc-5 g++-5 @@ -139,7 +143,7 @@ gcc-5_sanitize: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc5_sanitize.sh - ./tools/ci/scripts/runtests.sh - image: vicamo/debian:sid-i386 + image: i386/ubuntu:cosmic <<: *job-push variables: PACKAGES: gcc-5 g++-5 @@ -155,6 +159,7 @@ gcc-5_tests: script: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc5_tests.sh --without-dyecmd + image: ubuntu:cosmic <<: *job-push variables: PACKAGES: gcc-5 g++-5 @@ -170,7 +175,7 @@ gcc-5_tests_i386: script: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc5_tests.sh --without-dyecmd --without-manaplusgame - image: vicamo/debian:sid-i386 + image: i386/ubuntu:cosmic <<: *job-push variables: PACKAGES: gcc-5 g++-5 @@ -186,6 +191,7 @@ gcc-5_sdl2_tests: script: - ./tools/ci/jobs/gcc5_sdl2_tests.sh --without-manaplusgame --enable-glibcdebug - ./tools/ci/jobs/gcc5_sdl2_tests.sh --without-manaplusgame --enable-stldebug + image: ubuntu:cosmic <<: *job-push variables: PACKAGES: gcc-5 g++-5 @@ -200,7 +206,7 @@ gcc-5_sdl2_tests_i386: stage: build script: - ./tools/ci/jobs/gcc5_sdl2_tests.sh --without-dyecmd --without-manaplusgame - image: vicamo/debian:sid-i386 + image: i386/ubuntu:cosmic <<: *job-push variables: PACKAGES: gcc-5 g++-5 @@ -215,6 +221,7 @@ gcc-5_sdl2_no_opengl_tests: stage: build script: - ./tools/ci/jobs/gcc5_sdl2_tests.sh --without-opengl --without-dyecmd --without-manaplusgame + image: ubuntu:cosmic <<: *job-push variables: PACKAGES: gcc-5 g++-5 @@ -229,7 +236,7 @@ gcc-5_sdl2_no_opengl_tests_i386: stage: build script: - ./tools/ci/jobs/gcc5_sdl2_tests.sh --without-opengl --without-dyecmd --without-manaplusgame - image: vicamo/debian:sid-i386 + image: i386/ubuntu:cosmic <<: *job-push variables: PACKAGES: gcc-5 g++-5 @@ -248,6 +255,7 @@ gcc-5: - ./tools/ci/scripts/runtests.sh - ./tools/ci/jobs/gcc5_c++11.sh - ./tools/ci/scripts/runtests.sh + image: ubuntu:cosmic <<: *job-push variables: PACKAGES: gcc-5 g++-5 @@ -261,7 +269,7 @@ gcc-5_sdl2_c++11_i386: script: - ./tools/ci/jobs/gcc5_sdl2_c++11.sh - ./tools/ci/scripts/runtests.sh - image: vicamo/debian:sid-i386 + image: i386/ubuntu:cosmic <<: *job-push variables: PACKAGES: gcc-5 g++-5 @@ -278,6 +286,7 @@ gcc-5_default: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/any_compiler.sh --enable-werror - ./tools/ci/scripts/runtests.sh + image: ubuntu:cosmic <<: *job-push variables: LOGFILE: gcc5.log @@ -297,7 +306,7 @@ gcc-5_default_i386: - ./tools/ci/jobs/any_compiler.sh --enable-werror - ./tools/ci/scripts/runtests.sh <<: *job-push - image: vicamo/debian:sid-i386 + image: i386/ubuntu:cosmic variables: LOGFILE: gcc5.log CC: gcc-5 @@ -316,6 +325,7 @@ gcc-5_tarball: script: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc5_tarball.sh + image: ubuntu:cosmic <<: *job-push variables: PACKAGES: gcc-5 g++-5 |