summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorFedja Beader <fedja@protonmail.ch>2024-04-06 15:26:42 +0200
committerFedja Beader <fedja@protonmail.ch>2024-04-06 15:29:42 +0200
commit7dad7f273d46af6d2299f3615a426819563f527a (patch)
treefd1c82d11c4535f1b32b36bd9594df395c565549 /.gitlab-ci.yml
parent6e9ca1f29fdcc3ebc80b8e5b70ca42f1e77050a9 (diff)
downloadplus-7dad7f273d46af6d2299f3615a426819563f527a.tar.gz
plus-7dad7f273d46af6d2299f3615a426819563f527a.tar.bz2
plus-7dad7f273d46af6d2299f3615a426819563f527a.tar.xz
plus-7dad7f273d46af6d2299f3615a426819563f527a.zip
Move CI job image specifier to before script and after stage specifier
This is the most logical place for it, IMO. I left stage and branch specifier up top as this decision happens before any image is fetched.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml28
1 files changed, 14 insertions, 14 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7837a7650..acf3d1d81 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,11 +58,11 @@ variables:
# Disabled: drop 1386 support
.gcc-5_c++11_i386:
stage: prebuild
+ image: i386/ubuntu:xenial
script:
- ./tools/ci/scripts/patchsdl1.sh
- ./tools/ci/jobs/gcc5_c++11.sh
- ./tools/ci/scripts/runtests.sh
- image: i386/ubuntu:xenial
<<: *job-push
variables:
PACKAGES: gcc-5 g++-5
@@ -76,11 +76,11 @@ variables:
# Disabled: drop 1386 support
.gcc-8-i386:
stage: prebuild
+ image: i386/debian:buster
script:
- ./tools/ci/scripts/patchsdl1.sh
- ./tools/ci/jobs/gcc8.sh
- ./tools/ci/scripts/runtests.sh
- image: i386/debian:buster
<<: *job-push
variables:
PACKAGES: gcc-8 g++-8
@@ -113,12 +113,12 @@ gcc-snapshot_sdl2:
# Disabled: drop 1386 support
.gcc-10-i386:
stage: prebuild
+ image: i386/debian:unstable
script:
- ./tools/ci/scripts/patchsdl1.sh
- ./tools/ci/jobs/gcc10.sh
- ./tools/ci/scripts/runtests.sh
- ./tools/ci/scripts/rundyecmd.sh
- image: i386/debian:unstable
<<: *job-push
variables:
PACKAGES: gcc-10 g++-10
@@ -132,12 +132,12 @@ gcc-snapshot_sdl2:
# TODO: Clang 3.9 is down but we don't have a newer Clang to test?
.clang-3.9:
stage: prebuild
+ image: debian:stretch
script:
- ./tools/ci/scripts/patchsdl1.sh
- ./tools/ci/jobs/clang39.sh
- ./tools/ci/scripts/runtests.sh
- ./tools/ci/scripts/rundyecmd.sh
- image: debian:stretch
<<: *job-push
variables:
PACKAGES: clang-3.9 libc++-dev libc++abi-dev
@@ -150,12 +150,12 @@ gcc-snapshot_sdl2:
gcc-7:
stage: prebuild
+ image: debian:buster
script:
- ./tools/ci/scripts/patchsdl1.sh
- ./tools/ci/jobs/gcc7.sh
- ./tools/ci/scripts/runtests.sh
- ./tools/ci/scripts/rundyecmd.sh
- image: debian:buster
<<: *job-push
variables:
PACKAGES: gcc-7 g++-7
@@ -168,12 +168,12 @@ gcc-7:
gcc-8:
stage: prebuild
+ image: debian:buster
script:
- ./tools/ci/scripts/patchsdl1.sh
- ./tools/ci/jobs/gcc8.sh
- ./tools/ci/scripts/runtests.sh
- ./tools/ci/scripts/rundyecmd.sh
- image: debian:buster
<<: *job-push
variables:
PACKAGES: gcc-8 g++-8
@@ -186,12 +186,12 @@ gcc-8:
gcc-7_default:
stage: prebuild
+ image: debian:buster
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:buster
<<: *job-push
variables:
LOGFILE: gcc7.log
@@ -231,11 +231,11 @@ mxe_gcc6_shared_32:
only:
- branches@manaplus/manaplus
stage: prebuild
+ image: registry.gitlab.com/manaplus/mxe:gcc6_shared_32
script:
- ls /mxe
- ./tools/ci/jobs/mxe_gcc6.sh
<<: *job-push
- image: registry.gitlab.com/manaplus/mxe:gcc6_shared_32
variables:
PACKAGES: bash
CROSS: i686-w64-mingw32.shared
@@ -246,11 +246,11 @@ mxe_gcc6_shared_64:
only:
- branches@manaplus/manaplus
stage: prebuild
+ image: registry.gitlab.com/manaplus/mxe:gcc6_shared_64
script:
- ls /mxe
- ./tools/ci/jobs/mxe_gcc6.sh
<<: *job-push
- image: registry.gitlab.com/manaplus/mxe:gcc6_shared_64
variables:
PACKAGES: bash
CROSS: x86_64-w64-mingw32.shared
@@ -259,6 +259,7 @@ mxe_gcc6_shared_64:
gcc-5_sdl2:
stage: prebuild
+ image: ubuntu:xenial
script:
- ./tools/ci/jobs/gcc5_sdl2.sh
- ./tools/ci/scripts/rundyecmd.sh
@@ -266,7 +267,6 @@ gcc-5_sdl2:
- ./tools/ci/jobs/gcc5_sdl2_c++11.sh
- ./tools/ci/scripts/runtests.sh
<<: *job-push
- image: ubuntu:xenial
variables:
PACKAGES: gcc-5 g++-5
make autoconf automake autopoint gettext
@@ -309,10 +309,10 @@ gcc-10_dyecmd_only:
gcc-8_unittestsbin:
stage: prebuild
+ image: debian:buster
script:
- ./tools/ci/scripts/patchsdl1.sh
- ./tools/ci/jobs/gcc8_silent.sh --enable-unittestsbin --without-manaplusgame --without-dyecmd
- image: debian:buster
<<: *job-push
variables:
PACKAGES: gcc-8 g++-8
@@ -335,12 +335,12 @@ mplint:
linters:
stage: lint
+ image: debian:buster
script:
- ./tools/ci/jobs/pngcheck.sh
- ./tools/ci/jobs/imagemagiccheck.sh
- ./tools/ci/jobs/cpplint.sh
- ./tools/ci/jobs/nsiqcppstyle.sh
- image: debian:buster
<<: *job-push
variables:
PACKAGES: python wget pngcheck imagemagick git grep
@@ -349,6 +349,7 @@ linters:
gcc-5_h_all:
stage: prebuild
+ image: ubuntu:xenial
script:
- ./tools/ci/scripts/patchsdl1.sh
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL
@@ -357,7 +358,6 @@ gcc-5_h_all:
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -I/usr/include/SDL
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL
<<: *job-push
- image: ubuntu:xenial
variables:
PACKAGES: gcc-5 g++-5
make autoconf automake autopoint gettext
@@ -369,6 +369,7 @@ gcc-5_h_all:
# Disabled: drop 1386 support
.gcc-5_h_all_i386:
stage: prebuild
+ image: i386/ubuntu:xenial
script:
- ./tools/ci/scripts/patchsdl1.sh
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL
@@ -376,7 +377,6 @@ gcc-5_h_all:
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUNITTESTS -DUNITTESTS_CATCH -DUNITTESTS_EMBED -I/usr/include/SDL
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -I/usr/include/SDL
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL
- image: i386/ubuntu:xenial
<<: *job-push
variables:
PACKAGES: gcc-5 g++-5