diff options
| author | Jesusalva Jesusalva <jesusalva@themanaworld.org> | 2023-06-25 19:22:18 +0000 |
|---|---|---|
| committer | Administrator <admin@themanaworld.org> | 2023-06-25 19:22:18 +0000 |
| commit | c5bc7240438be03fd0181be39a635cc06557324f (patch) | |
| tree | 3fc426b9f1b0389e9ea41258a353cabc88f3abc1 | |
| parent | 4e3f1d6405a746d619b722cf71bc69dfd9271f0e (diff) | |
| download | plus-c5bc7240438be03fd0181be39a635cc06557324f.tar.gz plus-c5bc7240438be03fd0181be39a635cc06557324f.tar.bz2 plus-c5bc7240438be03fd0181be39a635cc06557324f.tar.xz plus-c5bc7240438be03fd0181be39a635cc06557324f.zip | |
Disable clang3.9 and Debian Stretch is no longer supported.
The coverage report is broken. I did not had time to fix it.
| -rw-r--r-- | .gitlab-ci.yml | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f7bcce955..544257b6c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,7 +52,7 @@ variables: expire_in: 1 day dependencies: - doxygen - - gcov_gcc6 +# - gcov_gcc7 # pre build # Disabled: drop 1386 support @@ -129,7 +129,8 @@ gcc-snapshot_sdl2: tags: - docker -clang-3.9: +# TODO: Clang 3.9 is down but we don't have a newer Clang to test? +.clang-3.9: stage: prebuild script: - ./tools/ci/scripts/patchsdl1.sh @@ -147,17 +148,17 @@ clang-3.9: tags: - docker -gcc-6: +gcc-7: stage: prebuild script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc6.sh + - ./tools/ci/jobs/gcc7.sh - ./tools/ci/scripts/runtests.sh - ./tools/ci/scripts/rundyecmd.sh - image: debian:stretch + image: debian:buster <<: *job-push variables: - PACKAGES: gcc-6 g++-6 + PACKAGES: gcc-7 g++-7 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 @@ -183,21 +184,21 @@ gcc-8: tags: - docker -gcc-6_default: +gcc-7_default: stage: prebuild script: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/any_compiler.sh --enable-werror - ./tools/ci/scripts/runtests.sh - ./tools/ci/scripts/rundyecmd.sh - image: debian:stretch + image: debian:buster <<: *job-push variables: - LOGFILE: gcc6.log - CC: gcc-6 - CXX: g++-6 + LOGFILE: gcc7.log + CC: gcc-7 + CXX: g++-7 CXXFLAGS: "-Wall -Wextra" - PACKAGES: gcc-6 g++-6 + PACKAGES: gcc-7 g++-7 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 @@ -387,15 +388,15 @@ gcc-5_h_all: tags: - docker -gcov_gcc6: +.gcov_gcc7: stage: build - image: debian:stretch + image: debian:buster script: - mkdir -p coverage/ - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc6_tests_gcov.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc7_tests_gcov.sh --without-dyecmd --without-manaplusgame variables: - PACKAGES: gcc-6 g++-6 + PACKAGES: gcc-7 g++-7 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 @@ -410,13 +411,13 @@ gcov_gcc6: reports: coverage_report: coverage_format: cobertura - path: coverage/gcc-6.xml + path: coverage/gcc-7.xml tags: - docker doxygen: stage: build - image: debian:stretch + image: debian:buster script: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/doxygen.sh @@ -434,12 +435,12 @@ doxygen: pages: stage: deploy - image: debian:stretch + image: debian:buster script: - mkdir -p public - cp -r doxygen/html/ public/doxygen/ - cp -r coverage/ public/coverage/ - - echo "<DOCTYPE html><head></head><body><a href='./doxygen/index.html'>Doxygen</a><br><a href='./coverage/gcc-6.html'>Coverage</a></body>" > public/index.html + - echo "<DOCTYPE html><head></head><body><a href='./doxygen/index.html'>Doxygen</a><br><a href='./coverage/gcc-7.html'>Coverage</a></body>" > public/index.html <<: *job-pages # tests |