From ead5c7ec423aef369ee28503e95649dce489bfd1 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 30 May 2020 07:28:59 +0300 Subject: Add missing image name in gcc-7 ci branches --- tools/ci/branches/ci_gcc7/.gitlab-ci.yml | 7 +++++++ tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml | 13 +++++++++++++ 2 files changed, 20 insertions(+) diff --git a/tools/ci/branches/ci_gcc7/.gitlab-ci.yml b/tools/ci/branches/ci_gcc7/.gitlab-ci.yml index 0cb5a54ea..4c14ec54d 100644 --- a/tools/ci/branches/ci_gcc7/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc7/.gitlab-ci.yml @@ -39,6 +39,7 @@ gcc-7: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc7.sh - ./tools/ci/scripts/runtests.sh + image: debian:buster <<: *job-push variables: PACKAGES: gcc-7 g++-7 @@ -52,6 +53,7 @@ gcc-7_sdl2: script: - ./tools/ci/jobs/gcc7.sh --with-sdl2 - ./tools/ci/scripts/runtests.sh + image: debian:buster <<: *job-push variables: PACKAGES: gcc-7 g++-7 @@ -80,6 +82,7 @@ gcc-7_default: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/any_compiler.sh --enable-werror - ./tools/ci/scripts/runtests.sh + image: debian:buster <<: *job-push variables: LOGFILE: gcc7.log @@ -98,6 +101,7 @@ gcc-7_sanitize: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc7_sanitize.sh - ./tools/ci/scripts/runtests.sh + image: debian:buster <<: *job-push variables: PACKAGES: gcc-7 g++-7 @@ -131,6 +135,7 @@ gcc-7_sanitize_sdl2: script: - ./tools/ci/jobs/gcc7_sanitize.sh --with-sdl2 - ./tools/ci/scripts/runtests.sh + image: debian:buster <<: *job-push variables: PACKAGES: gcc-7 g++-7 @@ -147,6 +152,7 @@ gcc-7_lto: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc7_lto.sh - ./tools/ci/scripts/runtests.sh + image: debian:buster <<: *job-push variables: PACKAGES: gcc-7 g++-7 @@ -180,6 +186,7 @@ gcc-7_default_i386: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/any_compiler.sh --enable-werror - ./tools/ci/scripts/runtests.sh + image: debian:buster <<: *job-push image: i386/debian:buster variables: diff --git a/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml b/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml index 3b5f88e6c..d1be7f727 100644 --- a/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml @@ -22,6 +22,7 @@ gcc-7_sanitize_doctest_tests: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc7_sanitize_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaplusgame - ldd ./src/manaplustests | grep "libasan" + image: debian:buster <<: *job-push variables: PACKAGES: gcc-7 g++-7 @@ -55,6 +56,7 @@ gcc-7_tests_simd: script: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc7_tests_simd.sh --without-dyecmd --without-manaplusgame + image: debian:buster <<: *job-push variables: PACKAGES: gcc-7 g++-7 @@ -70,6 +72,7 @@ gcc-7_tests_O0: script: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc7_tests_simd.sh --without-dyecmd --without-manaplusgame + image: debian:buster <<: *job-push variables: POST_CXXFLAGS: "-O0" @@ -86,6 +89,7 @@ gcc-7_tests_O1: script: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc7_tests_simd.sh --without-dyecmd --without-manaplusgame + image: debian:buster <<: *job-push variables: POST_CXXFLAGS: "-O1" @@ -102,6 +106,7 @@ gcc-7_tests_lto: script: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame + image: debian:buster <<: *job-push variables: POST_CXXFLAGS: "-ffast-math -O9 -flto -fwhole-program -funswitch-loops" @@ -152,6 +157,7 @@ gcc-7_tests_flags: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame --enable-glibcdebug - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame --enable-stldebug + image: debian:buster <<: *job-push variables: PACKAGES: gcc-7 g++-7 @@ -167,6 +173,7 @@ gcc-7_tests: script: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame + image: debian:buster <<: *job-push variables: PACKAGES: gcc-7 g++-7 @@ -200,6 +207,7 @@ gcc-7_sdl2_tests_i386: - echo test valgrind - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaplustests 2>logs/valg.log - grep "invalid" logs/valg.log && exit 1 || true + image: debian:buster <<: *job-push variables: PACKAGES: gcc-7 g++-7 @@ -235,6 +243,7 @@ gcc-7_separate_doctest: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc7_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd - ./tools/ci/scripts/separateunittests.sh + image: debian:buster <<: *job-push variables: PACKAGES: gcc-7 g++-7 @@ -250,6 +259,7 @@ gcc-7_separate_doctest_sanitize: - ./tools/ci/jobs/gcc7_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd - ./tools/ci/scripts/separateunittests.sh - ldd ./src/manaplustests | grep "libasan" + image: debian:buster <<: *job-push variables: LSAN_OPTIONS: "suppressions=./tools/ci/scripts/lsansuppression_tests.txt" @@ -275,6 +285,7 @@ gcc-7_separate_doctest_sanitize_sdl2: - ./tools/ci/jobs/gcc7_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd --with-sdl2 - ./tools/ci/scripts/separateunittests.sh - ldd ./src/manaplustests | grep "libasan" + image: debian:buster <<: *job-push variables: LSAN_OPTIONS: "suppressions=./tools/ci/scripts/lsansuppression_tests.txt" @@ -332,6 +343,7 @@ gcc-7_unsigned_char_tests: script: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame + image: debian:buster <<: *job-push variables: POST_CXXFLAGS: "-funsigned-char" @@ -347,6 +359,7 @@ gcc-7_sdl2_unsigned_char_tests: stage: build script: - ./tools/ci/jobs/gcc7_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame + image: debian:buster <<: *job-push variables: POST_CXXFLAGS: "-funsigned-char" -- cgit v1.2.3-70-g09d2