diff options
| author | Andoni Morales Alastruey <ylatuya@gmail.com> | 2021-10-12 23:13:44 +0200 |
|---|---|---|
| committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2021-10-14 10:13:51 +0000 |
| commit | 4be5c7ce0af79807123b8c974e19bc9bacdb2113 (patch) | |
| tree | f34a81ec12bf14dbafaa4e44fc8e472f3da3b899 /ci | |
| parent | a1e332bf7e93d68029a71158d66ae641453fc0d3 (diff) | |
| download | gstreamer-4be5c7ce0af79807123b8c974e19bc9bacdb2113.tar.gz | |
Fix GStreamer msys2 builds in the CI
Install ninja and the toolchain in the docker image.
Use the UCRT64 environment for building
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1000>
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/docker/windows/Dockerfile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ci/docker/windows/Dockerfile b/ci/docker/windows/Dockerfile index 260b467865..8ab3d5b431 100644 --- a/ci/docker/windows/Dockerfile +++ b/ci/docker/windows/Dockerfile @@ -18,6 +18,7 @@ RUN choco install -y windows-sdk-8.1 RUN choco install -y python3 RUN choco install -y msys2 --params '/NoPath /NoUpdate /InstallDir:C:\\msys64' +RUN c:\msys64\usr\bin\bash -lc 'pacman -S --noconfirm mingw-w64-ucrt-x86_64-toolchain ninja' # Visual Studio can't be installed with choco. # It depends on dotnetfx v4.8.0.20190930, which requires a reboot: dotnetfx (exit code 3010) # https://github.com/microsoft/vs-dockerfiles/blob/main/native-desktop/ @@ -35,6 +36,8 @@ RUN C:\TEMP\Install.cmd C:\TEMP\vs_buildtools.exe --quiet --wait --norestart --n --add Microsoft.VisualStudio.Workload.VCTools --includeRecommended` --installPath C:\BuildTools +RUN Get-ChildItem C:\BuildTools + RUN pip3 install meson RUN 'git config --global user.email "cirunner@gstreamer.freedesktop.org"; git config --global user.name "GStreamer CI system"' |