summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml16
1 files changed, 14 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6b59b54db..f99ce6265 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -230,7 +230,9 @@ gcc-10_default:
tags:
- docker
-mxe_gcc6_shared_32:
+# This and the next job do not work any more:
+# access denied pulling the specified image
+.mxe_gcc6_shared_32:
only:
- branches@manaplus/manaplus
stage: prebuild
@@ -245,7 +247,7 @@ mxe_gcc6_shared_32:
tags:
- docker
-mxe_gcc6_shared_64:
+.mxe_gcc6_shared_64:
only:
- branches@manaplus/manaplus
stage: prebuild
@@ -260,6 +262,16 @@ mxe_gcc6_shared_64:
tags:
- docker
+docker-windows-builder:
+ stage: prebuild
+ trigger:
+ project: mana/docker-windows-builder
+ strategy: depend
+ variables:
+ MP_BRANCH: $CI_COMMIT_REF_NAME
+ MP_REPOSITORY: $CI_PROJECT_URL
+
+
gcc-5_sdl2:
stage: prebuild
image: ubuntu:xenial