summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-03-14 21:23:30 +0300
committerAndrei Karas <akaras@inbox.ru>2017-03-14 21:25:17 +0300
commit14417a34d5e4272693eff6deb9d1aabcbb94cf16 (patch)
tree5147c2121524047ca56e905f82f787aab7606f7e /.gitlab-ci.yml
parent6c84be6bfc43e839bfd76f146aabfff6d1fd025f (diff)
downloadmanaplus-14417a34d5e4272693eff6deb9d1aabcbb94cf16.tar.gz
manaplus-14417a34d5e4272693eff6deb9d1aabcbb94cf16.tar.bz2
manaplus-14417a34d5e4272693eff6deb9d1aabcbb94cf16.tar.xz
manaplus-14417a34d5e4272693eff6deb9d1aabcbb94cf16.zip
Add into .gitlab-ci.yml build for mingw for windows 64 bits.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml15
1 files changed, 14 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5df3f3c0e..c70201632 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -132,13 +132,26 @@ mxe_gcc5_shared_32:
- ls /mxe
- ./tools/ci/jobs/mxe_gcc5.sh
<<: *job-shared
- image: registry.gitlab.com/manaplus/mxe:gcc5_shared
+ image: registry.gitlab.com/manaplus/mxe:gcc5_shared_32
variables:
PACKAGES: bash
CROSS: i686-w64-mingw32.shared
tags:
- docker
+mxe_gcc5_shared_64:
+ stage: build
+ script:
+ - ls /mxe
+ - ./tools/ci/jobs/mxe_gcc5.sh
+ <<: *job-shared
+ image: registry.gitlab.com/manaplus/mxe:gcc5_shared_64
+ variables:
+ PACKAGES: bash
+ CROSS: x86_64-w64-mingw32.shared
+ tags:
+ - docker
+
gcc-5_sdl2:
stage: build
script: