summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml6
1 files changed, 4 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 11f45725a..2c0fac142 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ variables:
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/gst-ci/amd64/windows:v16-master"
+ WINDOWS_IMAGE: "registry.freedesktop.org/gstreamer/gstreamer/amd64/windows:2021-10-01.0-master"
DEFAULT_MESON_ARGS: >
--default-library=both
@@ -246,7 +246,9 @@ fedora meson build:
# Copy GLib from existing subproject cache to avoid downloading it
- cd $env:CI_PROJECT_DIR
- - cp -r C:/subprojects/glib subprojects/
+ # 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/
# For some reason, options are separated by newline instead of space, so we
# have to replace them first.