summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Petridis <jordan@centricular.com>2021-08-18 15:16:24 +0300
committerJordan PetridÑ–s <jpetridis@gnome.org>2021-09-08 04:47:36 +0000
commit37c0ee72806b767a01b4eb60e533e3dc9c4bcbef (patch)
tree73d7ea8b2100ccf9aa507f790cb3c84735f7d557
parentabe89db32dbe93074f0eb22caa64b6411aa9373b (diff)
docker/windows: install vcredist140 explicitly
We depend on it for GStreamer builds and it was gettings pulled transiently by python3 install. Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-ci/-/merge_requests/405>
-rw-r--r--docker/windows/install_choco.ps15
1 files changed, 4 insertions, 1 deletions
diff --git a/docker/windows/install_choco.ps1 b/docker/windows/install_choco.ps1
index dd435ed..b19eb7b 100644
--- a/docker/windows/install_choco.ps1
+++ b/docker/windows/install_choco.ps1
@@ -4,6 +4,9 @@ Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://cho
Import-Module "$env:ProgramData\chocolatey\helpers\chocolateyProfile.psm1"
Update-SessionEnvironment
+choco install -y vcredist140
+$vc140_install = $?
+
Write-Host "Installing Chocolatey packages"
choco install -y cmake --installargs 'ADD_CMAKE_TO_PATH=System'
$cmake_install = $?
@@ -14,7 +17,7 @@ $git_install = $?
choco install -y python3 git-lfs 7zip
$rest_installs = $?
-if (!($cmake_install -and $git_install -and $rest_installs)) {
+if (!($vc140_install -and $cmake_install -and $git_install -and $rest_installs)) {
Write-Host "Failed to install some dependencies from choco"
Exit 1
}