summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFedja Beader <fedja@protonmail.ch>2024-04-05 20:19:35 +0200
committerFedja Beader <fedja@protonmail.ch>2024-04-05 20:19:35 +0200
commit8da1ccd2bb8aea35d78a2184478004a6b6cdbbe6 (patch)
tree967bff3e23352bcdbdee47baca246a442df29ff2
parent04ccd34b986ee6d6358e86c5d9d7bbbf3d7aaca5 (diff)
downloadmanaplus-test-ci.tar.gz
manaplus-test-ci.tar.bz2
manaplus-test-ci.tar.xz
manaplus-test-ci.zip
Switch the other gcc10 CI jobs to debian bullseye as well.test-ci
-rw-r--r--.gitlab-ci.yml7
1 files changed, 5 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e0c39e61e..5fec2bd9b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -91,13 +91,14 @@ variables:
tags:
- docker
-.gcc-snapshot_sdl2:
+gcc-snapshot_sdl2:
stage: prebuild
script:
- export PATH="/usr/lib/gcc-snapshot/bin:/usr/lib/gcc-snapshot/lib:$PATH"
- export LD_LIBRARY_PATH="/usr/lib/gcc-snapshot/lib:$LD_LIBRARY_PATH"
- ./tools/ci/jobs/gccsnapshot_sdl2.sh
- ./tools/ci/scripts/runtests.sh
+ image: debian:bullseye
<<: *job-push
variables:
ABOUTYOFFSET: 380
@@ -277,12 +278,13 @@ mxe_gcc6_shared_64:
tags:
- docker
-.gcc-10_game_only:
+gcc-10_game_only:
stage: prebuild
script:
- ./tools/ci/scripts/patchsdl1.sh
- ./tools/ci/jobs/gcc10.sh --without-dyecmd
- ./tools/ci/scripts/runtests.sh
+ image: debian:bullseye
<<: *job-push
variables:
PACKAGES: gcc-10 g++-10
@@ -299,6 +301,7 @@ mxe_gcc6_shared_64:
- ./tools/ci/scripts/patchsdl1.sh
- ./tools/ci/jobs/gcc10.sh --without-manaplusgame
- ./tools/ci/scripts/rundyecmd.sh
+ image: debian:bullseye
<<: *job-push
variables:
PACKAGES: gcc-10 g++-10