diff options
author | Nick Wellnhofer <wellnhofer@aevum.de> | 2022-09-06 23:27:01 +0200 |
---|---|---|
committer | Nick Wellnhofer <wellnhofer@aevum.de> | 2022-09-06 23:27:01 +0200 |
commit | c52dd494737d906986780c8037e001910fd42eaf (patch) | |
tree | 45fdf263c06b821c5c33de33880677076ff4ecf7 | |
parent | ea78427dcaa8fd58c1eb8ad10daa192a4be51a5f (diff) | |
download | libxml2-c52dd494737d906986780c8037e001910fd42eaf.tar.gz |
gitlab-ci: Move MSVC test to separate script
-rw-r--r-- | .gitlab-ci.yml | 26 | ||||
-rw-r--r-- | .gitlab-ci/Test-Msvc.ps1 | 43 |
2 files changed, 44 insertions, 25 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a86c6d31..1c8cc5a6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -188,32 +188,8 @@ cmake:mingw:w64-x86_64:static: - win32-ps variables: CMAKE_VERSION: 3.19.4 - before_script: - - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12" - - if (-not (Test-Path cmake-$Env:CMAKE_VERSION-win64-x64)) { - Invoke-WebRequest -Uri http://github.com/Kitware/CMake/releases/download/v$Env:CMAKE_VERSION/cmake-$Env:CMAKE_VERSION-win64-x64.zip -OutFile cmake-$Env:CMAKE_VERSION-win64-x64.zip ; - Expand-Archive cmake-$Env:CMAKE_VERSION-win64-x64.zip -DestinationPath . - } - - $Env:Path="$Env:CI_PROJECT_DIR\cmake-$Env:CMAKE_VERSION-win64-x64\bin;$Env:Path" - - 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 (Test-Path libxml2-build/xmlconf)) { - Invoke-WebRequest -Uri https://www.w3.org/XML/Test/xmlts20080827.tar.gz -OutFile xmlts20080827.tar.gz ; - .\7za.exe x xmlts20080827.tar.gz -olibxml2-build - } script: - - cmake -DBUILD_SHARED_LIBS="$Env:BUILD_SHARED_LIBS" -DCMAKE_INSTALL_PREFIX=libxml2-install -DLIBXML2_WITH_ICONV=OFF -DLIBXML2_WITH_LZMA=OFF -DLIBXML2_WITH_PYTHON=OFF -DLIBXML2_WITH_ZLIB=OFF -S . -B libxml2-build - - cmake --build libxml2-build --config Debug --target install - - cmake --build libxml2-build --config Release --target install - - New-Item -ItemType Directory libxml2-install\share\libxml2 - - Copy-Item Copyright libxml2-install\share\libxml2 - - cd libxml2-build - - ctest -C Debug -VV - - ctest -C Release -VV - after_script: - - .\7za.exe a libxml2-$Env:CI_COMMIT_SHORT_SHA-$Env:CMAKE_GENERATOR_TOOLSET-$Env:CMAKE_GENERATOR_PLATFORM-$Env:SUFFIX.7z .\libxml2-install\* + - .gitlab-ci/Test-Msvc cache: key: "msvc" paths: diff --git a/.gitlab-ci/Test-Msvc.ps1 b/.gitlab-ci/Test-Msvc.ps1 new file mode 100644 index 00000000..f4d9b9c9 --- /dev/null +++ b/.gitlab-ci/Test-Msvc.ps1 @@ -0,0 +1,43 @@ +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 + +if (-not (Test-Path cmake-$Env:CMAKE_VERSION-win64-x64)) { + Invoke-WebRequest ` + -Uri http://github.com/Kitware/CMake/releases/download/v$Env:CMAKE_VERSION/cmake-$Env:CMAKE_VERSION-win64-x64.zip ` + -OutFile cmake-$Env:CMAKE_VERSION-win64-x64.zip + Expand-Archive cmake-$Env:CMAKE_VERSION-win64-x64.zip -DestinationPath . +} +$Env:Path="$Env:CI_PROJECT_DIR\cmake-$Env:CMAKE_VERSION-win64-x64\bin;$Env:Path" + +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 (Test-Path libxml2-build/xmlconf)) { + Invoke-WebRequest ` + -Uri https://www.w3.org/XML/Test/xmlts20080827.tar.gz ` + -OutFile xmlts20080827.tar.gz ; + .\7za.exe x xmlts20080827.tar.gz -olibxml2-build +} + +cmake ` + -DBUILD_SHARED_LIBS="$Env:BUILD_SHARED_LIBS" ` + -DCMAKE_INSTALL_PREFIX=libxml2-install ` + -DLIBXML2_WITH_ICONV=OFF ` + -DLIBXML2_WITH_LZMA=OFF ` + -DLIBXML2_WITH_PYTHON=OFF ` + -DLIBXML2_WITH_ZLIB=OFF ` + -S . -B libxml2-build +cmake --build libxml2-build --config Debug --target install +cmake --build libxml2-build --config Release --target install +New-Item -ItemType Directory libxml2-install\share\libxml2 +Copy-Item Copyright libxml2-install\share\libxml2 + +cd libxml2-build +ctest -C Debug -VV +ctest -C Release -VV +cd .. + +.\7za.exe a libxml2-$Env:CI_COMMIT_SHORT_SHA-$Env:CMAKE_GENERATOR_TOOLSET-$Env:CMAKE_GENERATOR_PLATFORM-$Env:SUFFIX.7z .\libxml2-install\* |