summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml26
1 files changed, 13 insertions, 13 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e64278f21..a62369960 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,55 +49,55 @@ variables:
# pre build
-clang-3.9:
+gcc-5_c++11_i386:
stage: prebuild
script:
- - ./tools/ci/jobs/clang39.sh
+ - ./tools/ci/jobs/gcc5_c++11.sh
+ image: vicamo/debian:sid-i386
<<: *job-shared
variables:
- PACKAGES: clang-3.9 libc++-dev libc++abi-dev
+ PACKAGES: gcc-5 g++-5
make autoconf automake autopoint gettext libphysfs-dev
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
+ tags:
+ - docker
-gcc-5_c++11_i386:
+gcc-6-i386:
stage: prebuild
script:
- - ./tools/ci/jobs/gcc5_c++11.sh
+ - ./tools/ci/jobs/gcc6.sh
image: vicamo/debian:sid-i386
<<: *job-shared
variables:
- PACKAGES: gcc-5 g++-5
+ PACKAGES: gcc-6 g++-6
make autoconf automake autopoint gettext libphysfs-dev
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
tags:
- docker
-gcc-6:
+clang-3.9:
stage: prebuild
script:
- - ./tools/ci/jobs/gcc6.sh
+ - ./tools/ci/jobs/clang39.sh
<<: *job-shared
variables:
- PACKAGES: gcc-6 g++-6
+ PACKAGES: clang-3.9 libc++-dev libc++abi-dev
make autoconf automake autopoint gettext libphysfs-dev
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
-gcc-6-i386:
+gcc-6:
stage: prebuild
script:
- ./tools/ci/jobs/gcc6.sh
- image: vicamo/debian:sid-i386
<<: *job-shared
variables:
PACKAGES: gcc-6 g++-6
make autoconf automake autopoint gettext libphysfs-dev
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
- tags:
- - docker
gcc-4.4:
stage: prebuild