[libxslt] gitlab-ci: Install 7-Zip using the .msi
- From: Nick Wellnhofer <nwellnhof src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libxslt] gitlab-ci: Install 7-Zip using the .msi
- Date: Tue, 6 Sep 2022 20:58:35 +0000 (UTC)
commit 23bb5ab9e078d285f28c5e7cb1c2e52f8abfa9b6
Author: Nick Wellnhofer <wellnhofer aevum de>
Date: Tue Sep 6 19:26:12 2022 +0200
gitlab-ci: Install 7-Zip using the .msi
So we don't need cmake to extract a file.
.gitlab-ci.yml | 5 -----
.gitlab-ci/Install-7-Zip.ps1 | 6 +++---
2 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 89a7c5b8..da4aec46 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -150,10 +150,6 @@ cmake:linux:clang:static:
- 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 @@ cmake:mingw:w64-x86_64:static:
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 ff94ed69..02520f81 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
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]