diff options
| author | Jordan Petridis <jordan@centricular.com> | 2021-09-08 15:19:35 +0300 |
|---|---|---|
| committer | Jordan Petridis <jordan@centricular.com> | 2021-09-08 15:21:51 +0300 |
| commit | 72dcd55325513365a953cba9dbed91ec593606f8 (patch) | |
| tree | 9a34fce16f4ff0e31e4c11509594bb6240b8959f | |
| parent | 29596184bedf9f01b8068c96a7d7835a9e968c38 (diff) | |
docker/windows: update the subprojects cache
Avoid conflicting with gst-build subprojects when copying over
from the cache.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-ci/-/merge_requests/414>
| -rw-r--r-- | docker/windows/prepare_gst_env.ps1 | 1 | ||||
| -rw-r--r-- | gitlab/ci_template.yml | 2 |
2 files changed, 2 insertions, 1 deletions
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' |