From 8b6d318064660d4355aa22e572e2df3e16bb18b7 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 26 Jan 2019 22:50:03 +0300 Subject: Replace in gcc-5 ci builds unstable to cosmic --- .gitlab-ci.yml | 6 ++++-- tools/ci/branches/ci_customnls/.gitlab-ci.yml | 16 +++++++-------- tools/ci/branches/ci_gcc5/.gitlab-ci.yml | 28 ++++++++++++++++++--------- tools/ci/branches/ci_h/.gitlab-ci.yml | 8 ++++++-- 4 files changed, 37 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0022f817c..700d1e509 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,7 +49,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 @@ -214,6 +214,7 @@ gcc-5_sdl2: - ./tools/ci/jobs/gcc5_sdl2_c++11.sh - ./tools/ci/scripts/runtests.sh <<: *job-push + image: ubuntu:cosmic variables: PACKAGES: gcc-5 g++-5 make autoconf automake autopoint gettext @@ -292,6 +293,7 @@ gcc-5_h_all: - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -I/usr/include/SDL - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL <<: *job-push + image: ubuntu:cosmic variables: PACKAGES: gcc-5 g++-5 make autoconf automake autopoint gettext @@ -307,7 +309,7 @@ gcc-5_h_all_i386: - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUNITTESTS -DUNITTESTS_CATCH -DUNITTESTS_EMBED -I/usr/include/SDL - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -I/usr/include/SDL - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL - image: vicamo/debian:sid-i386 + image: i386/ubuntu:cosmic <<: *job-push variables: PACKAGES: gcc-5 g++-5 diff --git a/tools/ci/branches/ci_customnls/.gitlab-ci.yml b/tools/ci/branches/ci_customnls/.gitlab-ci.yml index dfafdacf0..272b4f30e 100644 --- a/tools/ci/branches/ci_customnls/.gitlab-ci.yml +++ b/tools/ci/branches/ci_customnls/.gitlab-ci.yml @@ -18,11 +18,11 @@ gcc_with_customnls: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc5.sh --enable-customnls --enable-werror + - ./tools/ci/jobs/gcc6.sh --enable-customnls --enable-werror - ./tools/ci/scripts/runtests.sh <<: *job-push variables: - PACKAGES: gcc-5 g++-5 + PACKAGES: gcc-6 g++-6 make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev @@ -31,11 +31,11 @@ gcc_with_customnls: gcc_with_customnls_sdl2: stage: build script: - - ./tools/ci/jobs/gcc5.sh --with-sdl2 --enable-customnls --enable-werror + - ./tools/ci/jobs/gcc6.sh --with-sdl2 --enable-customnls --enable-werror - ./tools/ci/scripts/runtests.sh <<: *job-push variables: - PACKAGES: gcc-5 g++-5 + PACKAGES: gcc-6 g++-6 make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev @@ -45,11 +45,11 @@ gcc_with_customnls_nonls: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc5.sh --enable-customnls --disable-nls --enable-werror + - ./tools/ci/jobs/gcc6.sh --enable-customnls --disable-nls --enable-werror - ./tools/ci/scripts/runtests.sh <<: *job-push variables: - PACKAGES: gcc-5 g++-5 + PACKAGES: gcc-6 g++-6 make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev @@ -58,11 +58,11 @@ gcc_with_customnls_nonls: gcc_with_customnls_nonls_sdl2: stage: build script: - - ./tools/ci/jobs/gcc5.sh --with-sdl2 --enable-customnls --disable-nls --enable-werror + - ./tools/ci/jobs/gcc6.sh --with-sdl2 --enable-customnls --disable-nls --enable-werror - ./tools/ci/scripts/runtests.sh <<: *job-push variables: - PACKAGES: gcc-5 g++-5 + PACKAGES: gcc-6 g++-6 make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev 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 diff --git a/tools/ci/branches/ci_h/.gitlab-ci.yml b/tools/ci/branches/ci_h/.gitlab-ci.yml index bacaa8fef..6ea46eb81 100644 --- a/tools/ci/branches/ci_h/.gitlab-ci.yml +++ b/tools/ci/branches/ci_h/.gitlab-ci.yml @@ -24,6 +24,7 @@ gcc-5_h_all: - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -I/usr/include/SDL - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL <<: *job-push + image: ubuntu:cosmic variables: PACKAGES: gcc-5 g++-5 make autoconf automake autopoint gettext @@ -40,7 +41,7 @@ gcc-5_h_all_i386: - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUNITTESTS -DUNITTESTS_CATCH -DUNITTESTS_EMBED -I/usr/include/SDL - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -I/usr/include/SDL - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL - image: vicamo/debian:sid-i386 + image: i386/ubuntu:cosmic <<: *job-push variables: PACKAGES: gcc-5 g++-5 @@ -60,6 +61,7 @@ gcc-5_h_pugi_all: - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_PUGIXML -I/usr/include/SDL - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_PUGIXML -DUNITTESTS -DUNITTESTS_CATCH -DUNITTESTS_EMBED -I/usr/include/SDL - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DENABLE_NLS -DUSE_OPENGL -DENABLE_PUGIXML -I/usr/include/SDL + image: ubuntu:cosmic <<: *job-push variables: PACKAGES: gcc-5 g++-5 @@ -77,6 +79,7 @@ gcc-5_h_tinyxml2_all: - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_TINYXML2 -I/usr/include/SDL - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_TINYXML2 -DUNITTESTS -DUNITTESTS_CATCH -DUNITTESTS_EMBED -I/usr/include/SDL - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DENABLE_NLS -DUSE_OPENGL -DENABLE_TINYXML2 -I/usr/include/SDL + image: ubuntu:cosmic <<: *job-push variables: PACKAGES: gcc-5 g++-5 @@ -92,6 +95,7 @@ gcc-5_h_sdl2: - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_LIBXML -DUSE_SDL2 -I/usr/include/SDL2 - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -DUSE_SDL2 -I/usr/include/SDL2 - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUNITTESTS -DUNITTESTS_CATCH -DUNITTESTS_EMBED -DUSE_SDL2 -I/usr/include/SDL2 + image: ubuntu:cosmic <<: *job-push variables: PACKAGES: gcc-5 g++-5 @@ -107,7 +111,7 @@ gcc-5_h_sdl2_i386: - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_LIBXML -DUSE_SDL2 -I/usr/include/SDL2 - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -DUSE_SDL2 -I/usr/include/SDL2 - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUNITTESTS -DUNITTESTS_CATCH -DUNITTESTS_EMBED -DUSE_SDL2 -I/usr/include/SDL2 - image: vicamo/debian:sid-i386 + image: i386/ubuntu:cosmic <<: *job-push variables: PACKAGES: gcc-5 g++-5 -- cgit v1.2.3-70-g09d2