From fa4a3243916fd3b57d9f5b9779efdf687eb4078e Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 12 Feb 2019 01:59:05 +0300 Subject: Use debian stretch in gcc-6 ci builds --- tools/ci/branches/ci_customnls/.gitlab-ci.yml | 4 ++++ tools/ci/branches/ci_gcc6/.gitlab-ci.yml | 16 +++++++++++----- tools/ci/branches/ci_gcc6_tests/.gitlab-ci.yml | 17 ++++++++++++----- 3 files changed, 27 insertions(+), 10 deletions(-) (limited to 'tools') diff --git a/tools/ci/branches/ci_customnls/.gitlab-ci.yml b/tools/ci/branches/ci_customnls/.gitlab-ci.yml index 272b4f30e..79e6ec289 100644 --- a/tools/ci/branches/ci_customnls/.gitlab-ci.yml +++ b/tools/ci/branches/ci_customnls/.gitlab-ci.yml @@ -20,6 +20,7 @@ gcc_with_customnls: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc6.sh --enable-customnls --enable-werror - ./tools/ci/scripts/runtests.sh + image: debian:stretch <<: *job-push variables: PACKAGES: gcc-6 g++-6 @@ -33,6 +34,7 @@ gcc_with_customnls_sdl2: script: - ./tools/ci/jobs/gcc6.sh --with-sdl2 --enable-customnls --enable-werror - ./tools/ci/scripts/runtests.sh + image: debian:stretch <<: *job-push variables: PACKAGES: gcc-6 g++-6 @@ -47,6 +49,7 @@ gcc_with_customnls_nonls: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc6.sh --enable-customnls --disable-nls --enable-werror - ./tools/ci/scripts/runtests.sh + image: debian:stretch <<: *job-push variables: PACKAGES: gcc-6 g++-6 @@ -60,6 +63,7 @@ gcc_with_customnls_nonls_sdl2: script: - ./tools/ci/jobs/gcc6.sh --with-sdl2 --enable-customnls --disable-nls --enable-werror - ./tools/ci/scripts/runtests.sh + image: debian:stretch <<: *job-push variables: PACKAGES: gcc-6 g++-6 diff --git a/tools/ci/branches/ci_gcc6/.gitlab-ci.yml b/tools/ci/branches/ci_gcc6/.gitlab-ci.yml index edaebf0b6..298300ff0 100644 --- a/tools/ci/branches/ci_gcc6/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc6/.gitlab-ci.yml @@ -22,7 +22,7 @@ gcc-6-i386: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc6.sh - ./tools/ci/scripts/runtests.sh - image: vicamo/debian:sid-i386 + image: i386/debian:stretch <<: *job-push variables: PACKAGES: gcc-6 g++-6 @@ -39,6 +39,7 @@ gcc-6: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc6.sh - ./tools/ci/scripts/runtests.sh + image: debian:stretch <<: *job-push variables: PACKAGES: gcc-6 g++-6 @@ -52,6 +53,7 @@ gcc-6_sdl2: script: - ./tools/ci/jobs/gcc6.sh --with-sdl2 - ./tools/ci/scripts/runtests.sh + image: debian:stretch <<: *job-push variables: PACKAGES: gcc-6 g++-6 @@ -65,8 +67,8 @@ gcc-6_sdl2_i386: script: - ./tools/ci/jobs/gcc6.sh --with-sdl2 - ./tools/ci/scripts/runtests.sh + image: i386/debian:stretch <<: *job-push - image: vicamo/debian:sid-i386 variables: PACKAGES: gcc-6 g++-6 make autoconf automake autopoint gettext @@ -80,6 +82,7 @@ gcc-6_default: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/any_compiler.sh --enable-werror - ./tools/ci/scripts/runtests.sh + image: debian:stretch <<: *job-push variables: LOGFILE: gcc6.log @@ -98,6 +101,7 @@ gcc-6_sanitize: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc6_sanitize.sh - ./tools/ci/scripts/runtests.sh + image: debian:stretch <<: *job-push variables: PACKAGES: gcc-6 g++-6 @@ -115,7 +119,7 @@ gcc-6_sanitize: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc6_sanitize.sh - ./tools/ci/scripts/runtests.sh - image: vicamo/debian:sid-i386 + image: i386/debian:stretch <<: *job-push variables: PACKAGES: gcc-6 g++-6 @@ -131,6 +135,7 @@ gcc-6_sanitize_sdl2: script: - ./tools/ci/jobs/gcc6_sanitize.sh --with-sdl2 - ./tools/ci/scripts/runtests.sh + image: debian:stretch <<: *job-push variables: PACKAGES: gcc-6 g++-6 @@ -147,6 +152,7 @@ gcc-6_lto: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc6_lto.sh - ./tools/ci/scripts/runtests.sh + image: debian:stretch <<: *job-push variables: PACKAGES: gcc-6 g++-6 @@ -161,7 +167,7 @@ gcc-6_lto_i386: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc6_lto.sh - ./tools/ci/scripts/runtests.sh - image: vicamo/debian:sid-i386 + image: i386/debian:stretch <<: *job-push variables: PACKAGES: gcc-6 g++-6 @@ -178,8 +184,8 @@ gcc-6_default_i386: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/any_compiler.sh --enable-werror - ./tools/ci/scripts/runtests.sh + image: i386/debian:stretch <<: *job-push - image: vicamo/debian:sid-i386 variables: LOGFILE: gcc6.log CC: gcc-6 diff --git a/tools/ci/branches/ci_gcc6_tests/.gitlab-ci.yml b/tools/ci/branches/ci_gcc6_tests/.gitlab-ci.yml index adf9f738c..f26477e95 100644 --- a/tools/ci/branches/ci_gcc6_tests/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc6_tests/.gitlab-ci.yml @@ -22,6 +22,7 @@ gcc-6_sanitize_doctest_tests: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc6_sanitize_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaplusgame - ldd ./src/manaplustests | grep "libasan" + image: debian:stretch <<: *job-push variables: PACKAGES: gcc-6 g++-6 @@ -37,7 +38,7 @@ gcc-6_doctest_tests_i386: script: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc6_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaplusgame - image: vicamo/debian:sid-i386 + image: i386/debian:stretch <<: *job-push variables: PACKAGES: gcc-6 g++-6 @@ -53,6 +54,7 @@ gcc-6_tests_simd: script: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc6_tests_simd.sh --without-dyecmd --without-manaplusgame + image: debian:stretch <<: *job-push variables: PACKAGES: gcc-6 g++-6 @@ -68,6 +70,7 @@ gcc-6_tests_lto: script: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame + image: debian:stretch <<: *job-push variables: POST_CXXFLAGS: "-ffast-math -O9 -flto -fwhole-program -funswitch-loops" @@ -85,7 +88,7 @@ gcc-6_tests_lto_i386: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame <<: *job-push - image: vicamo/debian:sid-i386 + image: i386/debian:stretch variables: POST_CXXFLAGS: "-ffast-math -O9 -flto -fwhole-program -funswitch-loops" PACKAGES: gcc-6 g++-6 @@ -101,6 +104,7 @@ gcc-6_tests: script: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame + image: debian:stretch <<: *job-push variables: PACKAGES: gcc-6 g++-6 @@ -116,7 +120,7 @@ gcc-6_tests_i386: script: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame - image: vicamo/debian:sid-i386 + image: i386/debian:stretch <<: *job-push variables: PACKAGES: gcc-6 g++-6 @@ -132,6 +136,7 @@ gcc-6_tests_glibcdebug: script: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame --enable-glibcdebug + image: debian:stretch <<: *job-push variables: PACKAGES: gcc-6 g++-6 @@ -147,7 +152,7 @@ gcc-6_tests_glibcdebug_i386: script: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame --enable-glibcdebug - image: vicamo/debian:sid-i386 + image: i386/debian:stretch <<: *job-push variables: PACKAGES: gcc-6 g++-6 @@ -162,6 +167,7 @@ gcc-6_sdl2_tests: stage: build script: - ./tools/ci/jobs/gcc6_sdl2_tests.sh --without-dyecmd --without-manaplusgame + image: debian:stretch <<: *job-push variables: PACKAGES: gcc-6 g++-6 @@ -176,7 +182,7 @@ gcc-6_sdl2_tests_i386: stage: build script: - ./tools/ci/jobs/gcc6_sdl2_tests.sh --without-dyecmd --without-manaplusgame - image: vicamo/debian:sid-i386 + image: i386/debian:stretch <<: *job-push variables: PACKAGES: gcc-6 g++-6 @@ -230,6 +236,7 @@ gcc-6_tarball_tests: script: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc6_tarball_tests.sh --without-dyecmd --without-manaplusgame + image: debian:stretch <<: *job-push variables: PACKAGES: gcc-6 g++-6 -- cgit v1.2.3-60-g2f50