From e0f0b5c829c9bca2fd307101804184e311cef965 Mon Sep 17 00:00:00 2001 From: "L. E. Segovia" Date: Tue, 12 Nov 2024 21:41:41 +0000 Subject: [PATCH] ci/windows: Add WiX v5 Part-of: --- .gitlab-image-tags.yml | 2 +- ci/docker/windows/Dockerfile | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.gitlab-image-tags.yml b/.gitlab-image-tags.yml index 5f2e6d05ae..3815be34a3 100644 --- a/.gitlab-image-tags.yml +++ b/.gitlab-image-tags.yml @@ -13,4 +13,4 @@ variables: LINT_TAG: '2024-02-20.0' - WINDOWS_TAG: '2024-11-05.0' + WINDOWS_TAG: '2024-11-12.0' diff --git a/ci/docker/windows/Dockerfile b/ci/docker/windows/Dockerfile index 7484d375c4..0fd0f1d972 100644 --- a/ci/docker/windows/Dockerfile +++ b/ci/docker/windows/Dockerfile @@ -42,8 +42,18 @@ RUN choco install -y 7zip # See https://gitlab.freedesktop.org/gstreamer/cerbero/-/issues/427 RUN choco install -y python3 --version=3.11.2 --installargs 'AssociateFiles=1 PrependPath=1 Include_pip=1 Include_dev=1' RUN choco install -y msys2 --params '/NoPath /NoUpdate /InstallDir:C:\\msys64' + +# Install WiX v3 RUN choco install --execution-timeout=3600 -y wixtoolset +# Install Wix v5 (complete install, no NuGet) from MSI +RUN Invoke-WebRequest -Uri https://download.visualstudio.microsoft.com/download/pr/78caa28b-2982-43ed-8b9c-20e3369f0795/c771e9fd12a67068436115cf295740f7/dotnet-runtime-6.0.16-win-x86.exe -OutFile C:\TEMP\dotnet-runtime-6.0.16-win-x86.exe +RUN C:\TEMP\dotnet-runtime-6.0.16-win-x86.exe /quiet +RUN Invoke-WebRequest -Uri https://download.visualstudio.microsoft.com/download/pr/456fdf02-f100-4664-916d-fd46c192efea/619bbd8426537632b7598b4c7c467cf1/dotnet-runtime-6.0.16-win-x64.exe -OutFile C:\TEMP\dotnet-runtime-6.0.16-win-x64.exe +RUN C:\TEMP\dotnet-runtime-6.0.16-win-x64.exe /quiet +RUN Invoke-WebRequest -Uri https://github.com/wixtoolset/wix/releases/download/v5.0.1/wix-cli-x64.msi -OutFile C:\TEMP\wix-cli-x64.msi +RUN msiexec /i C:\TEMP\wix-cli-x64.msi + # Remove MAX_PATH limit of 260 characters RUN New-ItemProperty -Path 'HKLM:\\SYSTEM\\CurrentControlSet\\Control\\FileSystem' ` -Name "LongPathsEnabled" -Value 1 -PropertyType DWORD -Force