From 9e6863415ae5efc26e57ef6993e781ae51b3fb4f Mon Sep 17 00:00:00 2001 From: Fedja Beader Date: Tue, 25 Jun 2024 15:22:43 +0000 Subject: re-integrate windows CI - [x] integrate docker-windows-builder with or instead of the existing disabled MXE jobs - [x] fix rebranding breaking windows CI (already pushed to master) Part of #71 Squashed with: * $CI_COMMIT_BRANCH is unset in merge request pipelines * Too much text * Cleanup now that the builder branch is merged * Revert "Disable unnecessary builders" This reverts commit f4820e05439792a02601dfef0e2e2ad148615f1f. * Try depend strategy + de-hardcode stuff cleanup * Use downstream branch created for this purpose (testring only, switch to master before merging) * Multi-project pipeline, attempt #1 missing stage definition * Disable back, comment why it doesen't work Forgot to disable the broken windows builder job * Does existing MXE job even work? Kinda doubt it, but after this you can't blame me for not trying (What's the purpose of windows-docker-builder if this works?) But lets try the *32 one as well * Disable unnecessary builders **** mana/plus!87 --- .gitlab-ci.yml | 16 ++++++++++++++-- 1 file 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 -- cgit v1.2.3-70-g09d2