diff options
author | Jordan Petridis <jordan@centricular.com> | 2022-08-18 15:25:08 +0300 |
---|---|---|
committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2022-08-26 15:56:47 +0000 |
commit | 21ac55bac222f3ba806f872772ba03144c83bde9 (patch) | |
tree | 7cd94d868757f2183c1116c25ba036274fbf84f3 | |
parent | 8e3e6ddba3edbb8fc628c54249e277311177568c (diff) | |
download | gstreamer-21ac55bac222f3ba806f872772ba03144c83bde9.tar.gz |
docker/windows: Pass a couple installargs to python3
From these, only PrependPath isn't enabled by default,
but its nice to explicitly enable the ones we need anyway.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2933>
-rw-r--r-- | .gitlab-ci.yml | 2 | ||||
-rw-r--r-- | ci/docker/windows/Dockerfile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 30f6d7f2b5..923debee74 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,7 +26,7 @@ variables: ### FEDORA_TAG: '2022-07-31.0' INDENT_TAG: '2022-03-07.1' - WINDOWS_TAG: "2022-07-31.0" + WINDOWS_TAG: "2022-08-18.0" GST_UPSTREAM_REPO: 'gstreamer/gstreamer' FDO_UPSTREAM_REPO: 'gstreamer/gstreamer' diff --git a/ci/docker/windows/Dockerfile b/ci/docker/windows/Dockerfile index d6628b7afd..eefa8b55c5 100644 --- a/ci/docker/windows/Dockerfile +++ b/ci/docker/windows/Dockerfile @@ -16,7 +16,7 @@ RUN choco install -y cmake --installargs 'ADD_CMAKE_TO_PATH=System' RUN choco install -y git --params '/NoAutoCrlf /NoCredentialManager /NoShellHereIntegration /NoGuiHereIntegration /NoShellIntegration' RUN choco install -y git-lfs RUN choco install -y 7zip -RUN choco install -y python3 +RUN choco install -y python3 --installargs 'AssociateFiles=1 PrependPath=1 Include_pip=1 Include_dev=1' RUN choco install -y msys2 --params '/NoPath /NoUpdate /InstallDir:C:\\msys64' # Remove MAX_PATH limit of 260 characters |