5 files changed, 146 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 95ed4917f..a92c911ea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -967,6 +967,34 @@ gcc-5_tarball_tests:
               libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev 
               valgrind
 
+.gentoo_gcc-5_tests:
+  stage: build
+  script:
+  - ./tools/ci/jobs/gcc5_tests.sh --without-dyecmd --without-manaplusgame
+  image: registry.gitlab.com/manaplus/images:gentoo_gcc54_sdl1
+  <<: *job-shared
+  variables:
+    PMUPDATE: "echo"
+    PMINSTALL: "echo"
+    NEWCC: gcc-5.4.0
+    NEWCXX: g++-5.4.0-r3
+  tags:
+    - docker
+
+.gentoo_gcc-5_tests_sdl2:
+  stage: build
+  script:
+  - ./tools/ci/jobs/gcc5_tests.sh --without-dyecmd --without-manaplusgame --with-sdl2
+  image: registry.gitlab.com/manaplus/images:gentoo_gcc54_sdl2
+  <<: *job-shared
+  variables:
+    PMUPDATE: "echo"
+    PMINSTALL: "echo"
+    NEWCC: gcc-5.4.0
+    NEWCXX: g++-5.4.0-r3
+  tags:
+    - docker
+
 # simple builds
 
 gcc-3_sdl1:
@@ -993,6 +1021,62 @@ gcc-3_sdl2:
   tags:
     - docker
 
+gcc-4.1_sdl1:
+  stage: build
+  script:
+  - ./tools/ci/jobs/gcc41.sh
+  image: registry.gitlab.com/manaplus/images:gentoo_gcc41_sdl1
+  <<: *job-shared
+  variables:
+    PMUPDATE: "echo"
+    PMINSTALL: "echo"
+    NEWCC: gcc-4.1.2
+    NEWCXX: g++-4.1.2
+  tags:
+    - docker
+
+gcc-4.1_sdl2:
+  stage: build
+  script:
+  - ./tools/ci/jobs/gcc41.sh --with-sdl2
+  image: registry.gitlab.com/manaplus/images:gentoo_gcc41_sdl2
+  <<: *job-shared
+  variables:
+    PMUPDATE: "echo"
+    PMINSTALL: "echo"
+    NEWCC: gcc-4.1.2
+    NEWCXX: g++-4.1.2
+  tags:
+    - docker
+
+gcc-4.3_sdl1:
+  stage: build
+  script:
+  - ./tools/ci/jobs/gcc43.sh
+  image: registry.gitlab.com/manaplus/images:gentoo_gcc43_sdl1
+  <<: *job-shared
+  variables:
+    PMUPDATE: "echo"
+    PMINSTALL: "echo"
+    NEWCC: gcc-4.3.6
+    NEWCXX: g++-4.3.6
+  tags:
+    - docker
+
+gcc-4.3_sdl2:
+  stage: build
+  script:
+  - ./tools/ci/jobs/gcc43.sh --with-sdl2
+  image: registry.gitlab.com/manaplus/images:gentoo_gcc43_sdl2
+  <<: *job-shared
+  variables:
+    PMUPDATE: "echo"
+    PMINSTALL: "echo"
+    NEWCC: gcc-4.3.6
+    NEWCXX: g++-4.3.6
+  tags:
+    - docker
+
 gcc-4.4_i386:
   stage: build
   script:
diff --git a/tools/ci/jobs/gcc3.sh b/tools/ci/jobs/gcc3.sh
index cce38d75e..41e53a30e 100755
--- a/tools/ci/jobs/gcc3.sh
+++ b/tools/ci/jobs/gcc3.sh
@@ -2,6 +2,14 @@
 
 export CC=gcc-3.4.6
 export CXX=g++-3.4.6
+
+if [ "$NEWCC" != "" ]; then
+    export CC="$NEWCC"
+fi
+if [ "$NEWCXX" != "" ]; then
+    export CXX="$NEWCXX"
+fi
+
 export LOGFILE=gcc3.log
 
 source ./tools/ci/scripts/init.sh
diff --git a/tools/ci/jobs/gcc41.sh b/tools/ci/jobs/gcc41.sh
new file mode 100755
index 000000000..545cd898c
--- /dev/null
+++ b/tools/ci/jobs/gcc41.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+export CC=gcc-4.1
+export CXX=g++-4.1
+
+if [ "$NEWCC" != "" ]; then
+    export CC="$NEWCC"
+fi
+if [ "$NEWCXX" != "" ]; then
+    export CXX="$NEWCXX"
+fi
+
+export LOGFILE=gcc41.log
+
+source ./tools/ci/scripts/init.sh
+
+do_init
+run_configure $*
+run_make
+
+source ./tools/ci/scripts/exit.sh
+
+exit 0
diff --git a/tools/ci/jobs/gcc43.sh b/tools/ci/jobs/gcc43.sh
new file mode 100755
index 000000000..dd6f3c381
--- /dev/null
+++ b/tools/ci/jobs/gcc43.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+export CC=gcc-4.3.6-r1
+export CXX=g++-4.3.6-r1
+
+if [ "$NEWCC" != "" ]; then
+    export CC="$NEWCC"
+fi
+if [ "$NEWCXX" != "" ]; then
+    export CXX="$NEWCXX"
+fi
+
+export LOGFILE=gcc43.log
+
+source ./tools/ci/scripts/init.sh
+
+do_init
+run_configure $*
+run_make
+
+source ./tools/ci/scripts/exit.sh
+
+exit 0
diff --git a/tools/ci/jobs/gcc5.sh b/tools/ci/jobs/gcc5.sh
index cad54dd0d..05aa51e5a 100755
--- a/tools/ci/jobs/gcc5.sh
+++ b/tools/ci/jobs/gcc5.sh
@@ -2,6 +2,14 @@
 
 export CC=gcc-5
 export CXX=g++-5
+
+if [ "$NEWCC" != "" ]; then
+    export CC="$NEWCC"
+fi
+if [ "$NEWCXX" != "" ]; then
+    export CXX="$NEWCXX"
+fi
+
 export LOGFILE=gcc5.log
 
 source ./tools/ci/scripts/init.sh