[cairo-commit] 2 commits - .gitlab-ci.yml

[GitLab Mirror]

 .gitlab-ci.yml |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 20a3767c474b5177552be782a3105fe374b8d9a6
Merge: 21d7198be 02eac251b
Author: Uli Schlachter <psychon at znc.in>
Date:   Sun May 29 05:30:16 2022 +0000

    Merge branch 'reenable-windows-ci' into 'master'
    
    Revert "ci: Make Windows jobs manual"
    
    See merge request cairo/cairo!326

commit 02eac251b0e6bb1bc812754c68cc2603f7a6a239
Author: Uli Schlachter <psychon at znc.in>
Date:   Sun May 15 08:42:47 2022 +0200

    Revert "ci: Make Windows jobs manual"
    
    This reverts commit 9cfa5104648bb6ebaa264a2b427a8a991faee570.
    
    The vs2017 amd64 and x86 jobs where marked as manual in  MR !285 with
    the following reasoning:
    
        The CI runners for Windows are currently timing out on the fd.o
        infrastructure. The issue is being worked on, but we should avoid
        blocking our entire CI pipeline until it's fixed, as it sounds it is
        going to take a while.
    
    It is time to re-enable these jobs.
    
    Signed-off-by: Uli Schlachter <psychon at znc.in>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 873e1bfdb..c3bde7453 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -300,13 +300,11 @@ meson vs2017 amd64:
   extends: '.build meson windows'
   variables:
     ARCH: 'amd64'
-  when: 'manual'
 
 meson vs2017 x86:
   extends: '.build meson windows'
   variables:
     ARCH: 'x86'
-  when: 'manual'
 
 meson android arm64 fedora:
   # TODO: should probably build our own image here some day