From a34226e5125c2c494624241ca2d0d3d575fd4782 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 1 Jun 2020 14:26:54 +0300 Subject: Add offset variable to sdl2 ci jobs due issues with sdl2 fonts rendering --- tools/ci/branches/ci_checks/.gitlab-ci.yml | 2 ++ tools/ci/branches/ci_clang6/.gitlab-ci.yml | 2 ++ tools/ci/branches/ci_clang7/.gitlab-ci.yml | 2 ++ tools/ci/branches/ci_fedora/.gitlab-ci.yml | 2 ++ tools/ci/branches/ci_gcc-snapshot/.gitlab-ci.yml | 2 ++ tools/ci/branches/ci_gcc10/.gitlab-ci.yml | 3 +++ tools/ci/branches/ci_gcc7/.gitlab-ci.yml | 3 +++ tools/ci/branches/ci_gcc8/.gitlab-ci.yml | 3 +++ tools/ci/branches/ci_gcc9/.gitlab-ci.yml | 3 +++ tools/ci/branches/ci_gcc9_tests/.gitlab-ci.yml | 2 +- tools/ci/branches/ci_glibcdebug/.gitlab-ci.yml | 4 ++++ tools/ci/branches/ci_main1/.gitlab-ci.yml | 3 +++ tools/ci/branches/ci_mse/.gitlab-ci.yml | 2 ++ tools/ci/branches/ci_xmllibs/.gitlab-ci.yml | 2 ++ 14 files changed, 34 insertions(+), 1 deletion(-) diff --git a/tools/ci/branches/ci_checks/.gitlab-ci.yml b/tools/ci/branches/ci_checks/.gitlab-ci.yml index e25d82de3..57aa9ac1d 100644 --- a/tools/ci/branches/ci_checks/.gitlab-ci.yml +++ b/tools/ci/branches/ci_checks/.gitlab-ci.yml @@ -62,6 +62,7 @@ gcc8_googleprofiler_sdl2: - ./tools/ci/scripts/runtests.sh <<: *job-push variables: + ABOUTYOFFSET: 380 PACKAGES: gcc-8 g++-8 make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev @@ -89,6 +90,7 @@ gcc8_checks_sdl2: - ./tools/ci/scripts/runtests.sh <<: *job-push variables: + ABOUTYOFFSET: 380 PACKAGES: gcc-8 g++-8 make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev diff --git a/tools/ci/branches/ci_clang6/.gitlab-ci.yml b/tools/ci/branches/ci_clang6/.gitlab-ci.yml index 07d802a26..0ec29486d 100644 --- a/tools/ci/branches/ci_clang6/.gitlab-ci.yml +++ b/tools/ci/branches/ci_clang6/.gitlab-ci.yml @@ -118,6 +118,7 @@ clang-6.0_sdl2: <<: *job-push image: debian:bullseye variables: + ABOUTYOFFSET: 380 PACKAGES: gcc g++ clang-6.0 libc++-dev libc++abi-dev libclang-6.0-dev make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev @@ -134,6 +135,7 @@ clang-6.0_sdl2_i386: <<: *job-push image: i386/debian:bullseye variables: + ABOUTYOFFSET: 380 PACKAGES: gcc g++ clang-6.0 libc++-dev libc++abi-dev libclang-6.0-dev make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev diff --git a/tools/ci/branches/ci_clang7/.gitlab-ci.yml b/tools/ci/branches/ci_clang7/.gitlab-ci.yml index 43f81a911..fd92572f6 100644 --- a/tools/ci/branches/ci_clang7/.gitlab-ci.yml +++ b/tools/ci/branches/ci_clang7/.gitlab-ci.yml @@ -118,6 +118,7 @@ clang-7.0_sdl2: <<: *job-push image: debian:buster variables: + ABOUTYOFFSET: 380 PACKAGES: clang-7 libc++-dev libc++abi-dev libclang-7-dev make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev @@ -134,6 +135,7 @@ clang-7.0_sdl2_i386: <<: *job-push image: i386/debian:buster variables: + ABOUTYOFFSET: 380 PACKAGES: clang-7 libc++-dev libc++abi-dev libclang-7-dev make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev diff --git a/tools/ci/branches/ci_fedora/.gitlab-ci.yml b/tools/ci/branches/ci_fedora/.gitlab-ci.yml index d8723b74b..c2dceaefc 100644 --- a/tools/ci/branches/ci_fedora/.gitlab-ci.yml +++ b/tools/ci/branches/ci_fedora/.gitlab-ci.yml @@ -81,6 +81,7 @@ fedora_gcc-snapshot: <<: *job-push image: fedora:rawhide variables: + ABOUTYOFFSET: 380 PMUPDATE: "dnf --nogpgcheck install --refresh -y @development-tools" PMINSTALL: "dnf --nogpgcheck install -y diffutils git nc bash tar findutils gcc gcc-c++ make libpng-devel libcurl-devel openssl-devel libxml2-devel gcc SDL-devel SDL_net-devel SDL_image-devel SDL_ttf-devel SDL_mixer-devel SDL_gfx-devel zlib-devel gettext-devel automake autoconf" FLAGS: "gccfedora.sh" @@ -95,6 +96,7 @@ fedora_gcc-snapshot_sdl2: <<: *job-push image: fedora:rawhide variables: + ABOUTYOFFSET: 380 PMUPDATE: "dnf --nogpgcheck install --refresh -y @development-tools" PMINSTALL: "dnf --nogpgcheck install -y diffutils git nc bash tar findutils mesa-libGL-devel gcc gcc-c++ make libpng-devel libcurl-devel openssl-devel libxml2-devel gcc SDL2-devel SDL2_net-devel SDL2_image-devel SDL2_ttf-devel SDL2_mixer-devel SDL2_gfx-devel zlib-devel gettext-devel automake autoconf" FLAGS: "gccfedora.sh" diff --git a/tools/ci/branches/ci_gcc-snapshot/.gitlab-ci.yml b/tools/ci/branches/ci_gcc-snapshot/.gitlab-ci.yml index 6a9f84135..91d5117f4 100644 --- a/tools/ci/branches/ci_gcc-snapshot/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc-snapshot/.gitlab-ci.yml @@ -56,6 +56,7 @@ gcc-snapshot_sdl2: - ./tools/ci/scripts/runtests.sh <<: *job-push variables: + ABOUTYOFFSET: 380 PACKAGES: gcc-snapshot make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev @@ -72,6 +73,7 @@ gcc-snapshot_sdl2_i386: image: i386/debian:unstable <<: *job-push variables: + ABOUTYOFFSET: 380 PACKAGES: gcc-snapshot make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev diff --git a/tools/ci/branches/ci_gcc10/.gitlab-ci.yml b/tools/ci/branches/ci_gcc10/.gitlab-ci.yml index 1584c709e..9acfd5a02 100644 --- a/tools/ci/branches/ci_gcc10/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc10/.gitlab-ci.yml @@ -54,6 +54,7 @@ gcc-10_sdl2: - ./tools/ci/scripts/runtests.sh <<: *job-push variables: + ABOUTYOFFSET: 380 PACKAGES: gcc-10 g++-10 make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev @@ -68,6 +69,7 @@ gcc-10_sdl2_i386: <<: *job-push image: i386/debian:unstable variables: + ABOUTYOFFSET: 380 PACKAGES: gcc-10 g++-10 make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev @@ -115,6 +117,7 @@ gcc-10_sanitize_sdl2: - ./tools/ci/scripts/runtests.sh <<: *job-push variables: + ABOUTYOFFSET: 380 PACKAGES: gcc-10 g++-10 make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev diff --git a/tools/ci/branches/ci_gcc7/.gitlab-ci.yml b/tools/ci/branches/ci_gcc7/.gitlab-ci.yml index 4c14ec54d..7586df0ae 100644 --- a/tools/ci/branches/ci_gcc7/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc7/.gitlab-ci.yml @@ -56,6 +56,7 @@ gcc-7_sdl2: image: debian:buster <<: *job-push variables: + ABOUTYOFFSET: 380 PACKAGES: gcc-7 g++-7 make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev @@ -70,6 +71,7 @@ gcc-7_sdl2_i386: <<: *job-push image: i386/debian:buster variables: + ABOUTYOFFSET: 380 PACKAGES: gcc-7 g++-7 make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev @@ -138,6 +140,7 @@ gcc-7_sanitize_sdl2: image: debian:buster <<: *job-push variables: + ABOUTYOFFSET: 380 PACKAGES: gcc-7 g++-7 make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev diff --git a/tools/ci/branches/ci_gcc8/.gitlab-ci.yml b/tools/ci/branches/ci_gcc8/.gitlab-ci.yml index 00b165429..29aaee53a 100644 --- a/tools/ci/branches/ci_gcc8/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc8/.gitlab-ci.yml @@ -54,6 +54,7 @@ gcc-8_sdl2: - ./tools/ci/scripts/runtests.sh <<: *job-push variables: + ABOUTYOFFSET: 380 PACKAGES: gcc-8 g++-8 make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev @@ -68,6 +69,7 @@ gcc-8_sdl2_i386: <<: *job-push image: i386/debian:unstable variables: + ABOUTYOFFSET: 380 PACKAGES: gcc-8 g++-8 make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev @@ -115,6 +117,7 @@ gcc-8_sanitize_sdl2: - ./tools/ci/scripts/runtests.sh <<: *job-push variables: + ABOUTYOFFSET: 380 PACKAGES: gcc-8 g++-8 make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev diff --git a/tools/ci/branches/ci_gcc9/.gitlab-ci.yml b/tools/ci/branches/ci_gcc9/.gitlab-ci.yml index 7fbe92bdb..ff98223ed 100644 --- a/tools/ci/branches/ci_gcc9/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc9/.gitlab-ci.yml @@ -54,6 +54,7 @@ gcc-9_sdl2: - ./tools/ci/scripts/runtests.sh <<: *job-push variables: + ABOUTYOFFSET: 380 PACKAGES: gcc-9 g++-9 make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev @@ -68,6 +69,7 @@ gcc-9_sdl2_i386: <<: *job-push image: i386/debian:unstable variables: + ABOUTYOFFSET: 380 PACKAGES: gcc-9 g++-9 make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev @@ -115,6 +117,7 @@ gcc-9_sanitize_sdl2: - ./tools/ci/scripts/runtests.sh <<: *job-push variables: + ABOUTYOFFSET: 380 PACKAGES: gcc-9 g++-9 make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev diff --git a/tools/ci/branches/ci_gcc9_tests/.gitlab-ci.yml b/tools/ci/branches/ci_gcc9_tests/.gitlab-ci.yml index 4d3c79acd..e93abe3d4 100644 --- a/tools/ci/branches/ci_gcc9_tests/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc9_tests/.gitlab-ci.yml @@ -305,7 +305,7 @@ gcc-9_separate_doctest_sanitize_sdl2: -fsanitize=signed-integer-overflow -fsanitize=bounds -fsanitize=alignment -fsanitize=object-size -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fsanitize=nonnull-attribute -fsanitize=returns-nonnull-attribute -fsanitize=bool - -fsanitize=enum -fsanitize=vptr -fsanitize=bounds-stric + -fsanitize=enum -fsanitize=vptr -fsanitize=bounds-strict -fno-var-tracking-assignments" PACKAGES: gcc-9 g++-9 make autoconf automake autopoint gettext diff --git a/tools/ci/branches/ci_glibcdebug/.gitlab-ci.yml b/tools/ci/branches/ci_glibcdebug/.gitlab-ci.yml index f826e8110..2ada2b528 100644 --- a/tools/ci/branches/ci_glibcdebug/.gitlab-ci.yml +++ b/tools/ci/branches/ci_glibcdebug/.gitlab-ci.yml @@ -68,6 +68,7 @@ gcc-8_glibcdebug_sdl2: - ./tools/ci/scripts/runtests.sh <<: *job-push variables: + ABOUTYOFFSET: 380 PACKAGES: gcc-8 g++-8 make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev @@ -82,6 +83,7 @@ gcc-8_glibcdebug_sdl2_i386: <<: *job-push image: i386/debian:unstable variables: + ABOUTYOFFSET: 380 PACKAGES: gcc-8 g++-8 make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev @@ -112,6 +114,7 @@ clang-7.0_glibcdebug_tests_sdl2: <<: *job-push image: debian:buster variables: + ABOUTYOFFSET: 380 PACKAGES: clang-7 libc++-dev libc++abi-dev libclang-7-dev make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev @@ -145,6 +148,7 @@ clang-7.0_glibcdebug_sdl2: <<: *job-push image: debian:buster variables: + ABOUTYOFFSET: 380 PACKAGES: clang-7 libc++-dev libc++abi-dev libclang-7-dev make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev diff --git a/tools/ci/branches/ci_main1/.gitlab-ci.yml b/tools/ci/branches/ci_main1/.gitlab-ci.yml index d2e1b3608..27ecc3655 100644 --- a/tools/ci/branches/ci_main1/.gitlab-ci.yml +++ b/tools/ci/branches/ci_main1/.gitlab-ci.yml @@ -139,6 +139,7 @@ gcc8_without_mumble_sdl2: - ./tools/ci/scripts/runtests.sh <<: *job-push variables: + ABOUTYOFFSET: 380 PACKAGES: gcc-8 g++-8 make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev @@ -245,6 +246,7 @@ gcc-8_unsigned_char_sdl2: - ./tools/ci/scripts/runtests.sh <<: *job-push variables: + ABOUTYOFFSET: 380 PACKAGES: gcc-8 g++-8 make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev @@ -273,6 +275,7 @@ gcc-8_password_sdl2: - ./tools/ci/scripts/runtests.sh <<: *job-push variables: + ABOUTYOFFSET: 380 PACKAGES: gcc-8 g++-8 make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev diff --git a/tools/ci/branches/ci_mse/.gitlab-ci.yml b/tools/ci/branches/ci_mse/.gitlab-ci.yml index e2f44aede..d35de9c08 100644 --- a/tools/ci/branches/ci_mse/.gitlab-ci.yml +++ b/tools/ci/branches/ci_mse/.gitlab-ci.yml @@ -70,6 +70,7 @@ gcc-7_mse_sdl2: image: debian:buster <<: *job-push variables: + ABOUTYOFFSET: 380 PACKAGES: gcc-7 g++-7 make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev @@ -84,6 +85,7 @@ gcc-7_mse_sdl2_i386: <<: *job-push image: i386/debian:buster variables: + ABOUTYOFFSET: 380 PACKAGES: gcc-7 g++-7 make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev diff --git a/tools/ci/branches/ci_xmllibs/.gitlab-ci.yml b/tools/ci/branches/ci_xmllibs/.gitlab-ci.yml index 9b1431bcb..b1dcf40e6 100644 --- a/tools/ci/branches/ci_xmllibs/.gitlab-ci.yml +++ b/tools/ci/branches/ci_xmllibs/.gitlab-ci.yml @@ -83,6 +83,7 @@ gcc-8_pugixml_sdl2: - ./tools/ci/scripts/runtests.sh <<: *job-push variables: + ABOUTYOFFSET: 380 PACKAGES: gcc-8 g++-8 make autoconf automake autopoint gettext libpugixml-dev libcurl4-gnutls-dev libpng-dev @@ -96,6 +97,7 @@ gcc-8_pugixml_sdl2_i386: - ./tools/ci/scripts/runtests.sh <<: *job-push variables: + ABOUTYOFFSET: 380 PACKAGES: gcc-8 g++-8 make autoconf automake autopoint gettext libpugixml-dev libcurl4-gnutls-dev libpng-dev -- cgit v1.2.3-60-g2f50