From 72dcd55325513365a953cba9dbed91ec593606f8 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Wed, 8 Sep 2021 15:19:35 +0300 Subject: docker/windows: update the subprojects cache Avoid conflicting with gst-build subprojects when copying over from the cache. Part-of: --- docker/windows/prepare_gst_env.ps1 | 1 + gitlab/ci_template.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/windows/prepare_gst_env.ps1 b/docker/windows/prepare_gst_env.ps1 index 601e799..ebde9f6 100644 --- a/docker/windows/prepare_gst_env.ps1 +++ b/docker/windows/prepare_gst_env.ps1 @@ -23,6 +23,7 @@ if (!$?) { Remove-Item -Force 'C:/gst-build/subprojects/*.wrap' Remove-Item -Recurse -Force 'C:/gst-build/subprojects/win-nasm' Remove-Item -Recurse -Force 'C:/gst-build/subprojects/win-flex-bison-binaries' +Remove-Item -Recurse -Force 'C:/gst-build/subprojects/macos-bison-binary' Move-Item C:\gst-build\subprojects C:\subprojects Remove-Item -Recurse -Force C:\gst-build diff --git a/gitlab/ci_template.yml b/gitlab/ci_template.yml index aaee920..ffef5f6 100644 --- a/gitlab/ci_template.yml +++ b/gitlab/ci_template.yml @@ -28,7 +28,7 @@ variables: MANIFEST_TAG: '2020-10-22.0' TEST_MANIFEST_TAG: '2020-10-22.0' INDENT_TAG: '2020-10-22.0' - WINDOWS_TAG: "2021-08-24.0" + WINDOWS_TAG: "2021-09-08.0" GST_UPSTREAM_REPO: 'gstreamer/gst-ci' -- cgit v1.2.3