diff options
| author | Uli Schlachter <psychon@znc.in> | 2022-05-29 05:30:16 +0000 |
|---|---|---|
| committer | Uli Schlachter <psychon@znc.in> | 2022-05-29 05:30:16 +0000 |
| commit | 20a3767c474b5177552be782a3105fe374b8d9a6 (patch) | |
| tree | 5b11c9bc2349480e657b8e1b494114b5f8326e3d /.gitlab-ci.yml | |
| parent | 21d7198befcf57240b2c0f7996e9741807ac4061 (diff) | |
| parent | 02eac251b0e6bb1bc812754c68cc2603f7a6a239 (diff) | |
| download | cairo-20a3767c474b5177552be782a3105fe374b8d9a6.tar.gz | |
Merge branch 'reenable-windows-ci' into 'master'
Revert "ci: Make Windows jobs manual"
See merge request cairo/cairo!326
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8e22d333f..a80f39a35 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 |