diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 70819efe25e896879b7426a55f942e43d922d7d5_LmdpdGxhYi1jaS55bWw=..ad6f8eb0f3a14532f71500160530ead041bc43c9_LmdpdGxhYi1jaS55bWw= 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -150,10 +150,6 @@ - Copy-Item Copyright libxslt-install\share\libxslt after_script: - .\7za.exe a libxslt-$Env:CI_COMMIT_SHORT_SHA-$Env:MSYSTEM-$Env:SUFFIX.7z .\libxslt-install\* - cache: - key: "$MSYSTEM" - paths: - - 7za.exe artifacts: paths: - libxslt-$Env:CI_COMMIT_SHORT_SHA-$Env:MSYSTEM-$Env:SUFFIX.7z @@ -231,7 +227,6 @@ key: "msvc" paths: - cmake-$Env:CMAKE_VERSION-win64-x64/ - - 7za.exe artifacts: paths: - libxslt-$Env:CI_COMMIT_SHORT_SHA-$Env:CMAKE_GENERATOR_TOOLSET-$Env:CMAKE_GENERATOR_PLATFORM-$Env:SUFFIX.7z diff --git a/.gitlab-ci/Install-7-Zip.ps1 b/.gitlab-ci/Install-7-Zip.ps1 index 70819efe25e896879b7426a55f942e43d922d7d5_LmdpdGxhYi1jaS9JbnN0YWxsLTctWmlwLnBzMQ==..ad6f8eb0f3a14532f71500160530ead041bc43c9_LmdpdGxhYi1jaS9JbnN0YWxsLTctWmlwLnBzMQ== 100644 --- a/.gitlab-ci/Install-7-Zip.ps1 +++ b/.gitlab-ci/Install-7-Zip.ps1 @@ -1,4 +1,4 @@ -if (-not (Test-Path 7za.exe)) { - Invoke-WebRequest -Uri https://www.7-zip.org/a/7z1900-extra.7z -OutFile 7z1900-extra.7z - cmake -E tar xf 7z1900-extra.7z 7za.exe +if (-not (Get-Command "7za.exe" -ErrorAction SilentlyContinue)) { + Invoke-WebRequest -Uri https://www.7-zip.org/a/7z2201.msi -OutFile 7z2201.msi + msiexec /i $Installer7Zip /qb }