summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-08-01 03:24:00 +0300
committerAndrei Karas <akaras@inbox.ru>2017-08-01 03:52:06 +0300
commit547fb04145d2ab1e5c68a47b1e673aa352d41da6 (patch)
tree6a9273615b7cf96da6fa3e59337585fd79e7d0cf /.gitlab-ci.yml
parent3641f656462c27eb34f9aba94bf943c083e054ee (diff)
downloadmv-547fb04145d2ab1e5c68a47b1e673aa352d41da6.tar.gz
mv-547fb04145d2ab1e5c68a47b1e673aa352d41da6.tar.bz2
mv-547fb04145d2ab1e5c68a47b1e673aa352d41da6.tar.xz
mv-547fb04145d2ab1e5c68a47b1e673aa352d41da6.zip
Use mxe with gcc-6 for mxe builds.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml32
1 files changed, 16 insertions, 16 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 70e13ca09..1105e600d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -202,37 +202,37 @@ gcc-4.4:
tags:
- docker
-mxe_gcc5_shared_32:
+mxe_gcc6_shared_32:
stage: prebuild
script:
- ls /mxe
- - ./tools/ci/jobs/mxe_gcc5.sh
+ - ./tools/ci/jobs/mxe_gcc6.sh
<<: *job-push
- image: registry.gitlab.com/manaplus/mxe:gcc5_shared_32
+ image: registry.gitlab.com/manaplus/mxe:gcc6_shared_32
variables:
PACKAGES: bash
CROSS: i686-w64-mingw32.shared
tags:
- docker
-mxe_gcc5_shared_64:
+mxe_gcc6_shared_64:
stage: prebuild
script:
- ls /mxe
- - ./tools/ci/jobs/mxe_gcc5.sh
+ - ./tools/ci/jobs/mxe_gcc6.sh
<<: *job-push
- image: registry.gitlab.com/manaplus/mxe:gcc5_shared_64
+ image: registry.gitlab.com/manaplus/mxe:gcc6_shared_64
variables:
PACKAGES: bash
CROSS: x86_64-w64-mingw32.shared
tags:
- docker
-mxe_gcc5_shared_32_testsbin:
+mxe_gcc6_shared_32_testsbin:
stage: prebuild
script:
- ls /mxe
- - ./tools/ci/jobs/mxe_gcc5_tests.sh --without-manaplusgame --without-dyecmd
+ - ./tools/ci/jobs/mxe_gcc6_tests.sh --without-manaplusgame --without-dyecmd
artifacts:
paths:
- logs
@@ -240,7 +240,7 @@ mxe_gcc5_shared_32_testsbin:
when: always
expire_in: 1 week
dependencies: []
- image: registry.gitlab.com/manaplus/mxe:gcc5_shared_32
+ image: registry.gitlab.com/manaplus/mxe:gcc6_shared_32
variables:
PACKAGES: bash
CROSS: i686-w64-mingw32.shared
@@ -249,11 +249,11 @@ mxe_gcc5_shared_32_testsbin:
tags:
- docker
-mxe_gcc5_shared_64_testsbin:
+mxe_gcc6_shared_64_testsbin:
stage: prebuild
script:
- ls /mxe
- - ./tools/ci/jobs/mxe_gcc5_tests.sh --without-manaplusgame --without-dyecmd
+ - ./tools/ci/jobs/mxe_gcc6_tests.sh --without-manaplusgame --without-dyecmd
artifacts:
paths:
- logs
@@ -261,7 +261,7 @@ mxe_gcc5_shared_64_testsbin:
when: always
expire_in: 1 week
dependencies: []
- image: registry.gitlab.com/manaplus/mxe:gcc5_shared_64
+ image: registry.gitlab.com/manaplus/mxe:gcc6_shared_64
variables:
PACKAGES: bash
CROSS: x86_64-w64-mingw32.shared
@@ -6052,7 +6052,7 @@ gitstats:
only:
- master
-mxe_gcc5_shared_32_tests:
+mxe_gcc6_shared_32_tests:
stage: build
script:
- tools\ci\jobs\windowstest.cmd files32
@@ -6063,14 +6063,14 @@ mxe_gcc5_shared_32_tests:
when: always
expire_in: 3 week
dependencies:
- - mxe_gcc5_shared_32_testsbin
+ - mxe_gcc6_shared_32_testsbin
when: manual
except:
- triggers
tags:
- windows
-mxe_gcc5_shared_64_tests:
+mxe_gcc6_shared_64_tests:
stage: build
script:
- tools\ci\jobs\windowstest.cmd files64
@@ -6080,7 +6080,7 @@ mxe_gcc5_shared_64_tests:
when: always
expire_in: 3 week
dependencies:
- - mxe_gcc5_shared_64_testsbin
+ - mxe_gcc6_shared_64_testsbin
when: manual
except:
- triggers