[libxml2] gitlab-ci: Consolidate CMake test scripts
- From: Nick Wellnhofer <nwellnhof src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libxml2] gitlab-ci: Consolidate CMake test scripts
- Date: Tue, 6 Sep 2022 19:50:31 +0000 (UTC)
commit e4bdbf3ddb5191402800312e872adb515e955841
Author: Nick Wellnhofer <wellnhofer aevum de>
Date: Tue Sep 6 21:29:24 2022 +0200
gitlab-ci: Consolidate CMake test scripts
.gitlab-ci.yml | 50 +++++++++++++++++-------------------------
.gitlab-ci/Fetch-W3C-Tests.ps1 | 4 ----
.gitlab-ci/Install-7-Zip.ps1 | 4 ----
.gitlab-ci/setup_mingw.sh | 6 +++++
.gitlab-ci/test_cmake.sh | 18 +++++++++++++++
5 files changed, 44 insertions(+), 38 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5aa0b014..3add68fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -59,11 +59,8 @@ clang:asan:
BASE_CONFIG: "--with-ftp --with-legacy --with-xptr-locs"
CHERE_INVOKING: "yes"
before_script:
- - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12"
- - $Env:Path="C:\msys64\$Env:MINGW_PATH\bin;C:\msys64\usr\bin;$Env:Path"
+ - $Env:Path="C:\msys64\usr\bin;$Env:Path"
- bash -lc 'sh .gitlab-ci/setup_mingw.sh autotools'
- - .gitlab-ci/Install-7-Zip
- - .gitlab-ci/Fetch-W3C-Tests
script:
- bash -lc 'sh .gitlab-ci/test.sh'
cache:
@@ -88,16 +85,12 @@ mingw:w64-x86_64:shared:
.cmake:linux:
image: registry.gitlab.gnome.org/gnome/libxml2
+ before_script:
+ - rm -rf libxml2-build
+ - mkdir libxml2-build
+ - ln -s /tests/xmlconf libxml2-build
script:
- - cmake -DBUILD_SHARED_LIBS=$BUILD_SHARED_LIBS -DCMAKE_INSTALL_PREFIX=libxml2-install
-DCMAKE_C_FLAGS='-Werror' -DCMAKE_BUILD_TYPE=RelWithDebInfo -DLIBXML2_XMLCONF_WORKING_DIR=/tests -S . -B
libxml2-build
- - cmake --build libxml2-build --target install
- - mkdir -p libxml2-install/share/libxml2
- - cp Copyright libxml2-install/share/libxml2
- - cd libxml2-build
- - ctest -VV
- after_script:
- - cd libxml2-install
- - tar -czf ../libxml2-$CI_COMMIT_SHORT_SHA-$CC-$SUFFIX.tar.gz *
+ - sh .gitlab-ci/test_cmake.sh
artifacts:
paths:
- libxml2-$CI_COMMIT_SHORT_SHA-$CC-$SUFFIX.tar.gz
@@ -105,8 +98,8 @@ mingw:w64-x86_64:shared:
cmake:linux:gcc:shared:
extends: .cmake:linux
- only:
- - schedules
+# only:
+# - schedules
variables:
BUILD_SHARED_LIBS: "ON"
CC: gcc
@@ -145,27 +138,17 @@ cmake:linux:clang:static:
variables:
CHERE_INVOKING: "yes"
before_script:
- - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12"
- - $Env:Path="C:\msys64\$Env:MINGW_PATH\bin;C:\msys64\usr\bin;$Env:Path"
+ - $Env:Path="C:\msys64\usr\bin;$Env:Path"
- bash -lc 'sh .gitlab-ci/setup_mingw.sh cmake ninja'
- - .gitlab-ci/Install-7-Zip
- - .gitlab-ci/Fetch-W3C-Tests
script:
- - cmake -G Ninja -DBUILD_SHARED_LIBS="$Env:BUILD_SHARED_LIBS" -DCMAKE_INSTALL_PREFIX=libxml2-install
-DCMAKE_C_FLAGS='-Werror' -DCMAKE_BUILD_TYPE=RelWithDebInfo -S . -B libxml2-build
- - cmake --build libxml2-build --target install
- - New-Item -ItemType Directory libxml2-install\share\libxml2
- - Copy-Item Copyright libxml2-install\share\libxml2
- - cd libxml2-build
- - ctest -VV
- after_script:
- - .\7za.exe a libxml2-$Env:CI_COMMIT_SHORT_SHA-$Env:MSYSTEM-$Env:SUFFIX.7z .\libxml2-install\*
+ - bash -lc 'sh .gitlab-ci/test_cmake.sh -G Ninja'
cache:
key: "$MSYSTEM"
paths:
- libxml2-build/xmlconf/
artifacts:
paths:
- - libxml2-$Env:CI_COMMIT_SHORT_SHA-$Env:MSYSTEM-$Env:SUFFIX.7z
+ - libxml2-$Env:CI_COMMIT_SHORT_SHA-$Env:MSYSTEM-$Env:SUFFIX.tar.gz
expire_in: 1 day
cmake:mingw:w64-i686:shared:
@@ -218,8 +201,14 @@ cmake:mingw:w64-x86_64:static:
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"
- - .gitlab-ci/Install-7-Zip
- - .gitlab-ci/Fetch-W3C-Tests
+ - 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
@@ -236,6 +225,7 @@ cmake:mingw:w64-x86_64:static:
paths:
- cmake-$Env:CMAKE_VERSION-win64-x64/
- libxml2-build/xmlconf/
+ - 7za.exe
artifacts:
paths:
-
libxml2-$Env:CI_COMMIT_SHORT_SHA-$Env:CMAKE_GENERATOR_TOOLSET-$Env:CMAKE_GENERATOR_PLATFORM-$Env:SUFFIX.7z
diff --git a/.gitlab-ci/setup_mingw.sh b/.gitlab-ci/setup_mingw.sh
index 9bfc935e..5168c2d1 100644
--- a/.gitlab-ci/setup_mingw.sh
+++ b/.gitlab-ci/setup_mingw.sh
@@ -9,3 +9,9 @@ fi
for module in libiconv python xz zlib "$@"; do
pacman --noconfirm -S --needed ${prefix}$module
done
+
+if [ ! -e libxml2-build/xmlconf ]; then
+ mkdir -p libxml2-build
+ wget https://www.w3.org/XML/Test/xmlts20080827.tar.gz -O - |
+ tar -C libxml2-build x
+fi
diff --git a/.gitlab-ci/test_cmake.sh b/.gitlab-ci/test_cmake.sh
new file mode 100644
index 00000000..a8838b0b
--- /dev/null
+++ b/.gitlab-ci/test_cmake.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+cmake "$@" \
+ -DBUILD_SHARED_LIBS=$BUILD_SHARED_LIBS \
+ -DCMAKE_INSTALL_PREFIX=libxml2-install \
+ -DCMAKE_C_FLAGS='-Werror' \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -S . -B libxml2-build
+cmake --build libxml2-build --target install
+
+(cd libxml2-build && ctest -VV)
+
+mkdir -p libxml2-install/share/libxml2
+cp Copyright libxml2-install/share/libxml2
+(cd libxml2-install &&
+ tar -czf ../libxml2-$CI_COMMIT_SHORT_SHA-$CC-$SUFFIX.tar.gz *)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]