From e1646a740349eff3c78b474497c688647a7a6b9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Thu, 7 Oct 2021 14:31:41 +0100 Subject: [PATCH 1/2] ci: bump windows image to latest Which should include the subprojects cache again. --- .gitlab-ci.yml | 9 ++++----- 1 file 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. From d3e0d27234a045b2279dd4db54bdec81f03920f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Thu, 7 Oct 2021 14:37:49 +0100 Subject: [PATCH 2/2] ci: update links in ci template from gst-ci to gstreamer monorep --- .gitlab-ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2f65e9bc7..58bb56889 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -221,7 +221,7 @@ fedora meson build: paths: - 'builddir/meson-logs/' -# Based on https://gitlab.freedesktop.org/gstreamer/gst-ci/-/blob/master/gitlab/ci_template.yml +# Based on https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/main/.gitlab-ci.yml (.build windows) .build meson windows: image: $WINDOWS_IMAGE stage: 'build' @@ -272,8 +272,9 @@ meson vs2017 x86: ARCH: 'x86' meson android arm64 fedora: - # See https://gitlab.freedesktop.org/gstreamer/gst-ci/container_registry/164 for current images - image: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/android-fedora:2020-10-22.0-master' + # TODO: should probably build our own image here some day + # See https://gitlab.freedesktop.org/gstreamer/gstreamer/container_registry/7689 for current images + image: 'registry.freedesktop.org/gstreamer/gstreamer/amd64/android-fedora:2020-10-22.0-master' stage: 'build' artifacts: name: "${CI_JOB_NAME}_${CI_COMMIT_SHA}"