diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2021-10-07 14:31:41 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2021-10-07 14:32:55 +0100 |
| commit | e1646a740349eff3c78b474497c688647a7a6b9a (patch) | |
| tree | 6a74c5fdfb38834ac7c6a7e12ea1c06e96c376cf /.gitlab-ci.yml | |
| parent | b63dc83c8b7844778cec2fa4bebea2651e397755 (diff) | |
| download | cairo-e1646a740349eff3c78b474497c688647a7a6b9a.tar.gz | |
ci: bump windows image to latest
Which should include the subprojects cache again.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7aaf78b84..2f65e9bc7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,8 +10,9 @@ variables: FDO_DISTRIBUTION_VERSION: '34' FDO_DISTRIBUTION_TAG: '2021-08-26.0' - # TODO: should probably get its own image at some point instead of reusing the GStreamer one. - WINDOWS_IMAGE: "registry.freedesktop.org/gstreamer/gstreamer/amd64/windows:2021-10-01.0-master" + # TODO: should probably get its own image at some point instead of reusing the GStreamer one + # See https://gitlab.freedesktop.org/gstreamer/gstreamer/container_registry/18035 for latest + WINDOWS_IMAGE: "registry.freedesktop.org/gstreamer/gstreamer/amd64/windows:2021-10-04.1-main" DEFAULT_MESON_ARGS: > --default-library=both @@ -246,9 +247,7 @@ fedora meson build: # Copy GLib from existing subproject cache to avoid downloading it - cd $env:CI_PROJECT_DIR - # FIXME: current windows image is missing the subproject cache, - # re-add this once the image has been fixed to include it again - # - cp -r C:/subprojects/glib subprojects/ + - cp -r C:/subprojects/glib subprojects/ # For some reason, options are separated by newline instead of space, so we # have to replace them first. |