diff options
| author | Nick Wellnhofer <wellnhofer@aevum.de> | 2022-09-04 22:12:32 +0200 |
|---|---|---|
| committer | Nick Wellnhofer <wellnhofer@aevum.de> | 2022-09-04 22:42:46 +0200 |
| commit | 98acf28f71b5596318bb1017515af9e62b2543af (patch) | |
| tree | 5c4ca53204684af059637651efc5dfb6ad7aebf6 /.gitlab-ci.yml | |
| parent | 5d32b12645667592a70021539dd5393bc426557b (diff) | |
| download | libxml2-98acf28f71b5596318bb1017515af9e62b2543af.tar.gz | |
Use $MSYSTEM and 'bash -lc' in MinGW CI
Setting the $MSYSTEM environment variable and invoking shell scripts
with 'bash -lc' sets up the correct MinGW environment.
See https://www.msys2.org/docs/ci/
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fd50edf2..09f705ef 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,13 +60,13 @@ clang:msan: before_script: - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12" - $Env:Path="C:\msys64\$Env:MINGW_PATH\bin;C:\msys64\usr\bin;$Env:Path" - - .gitlab-ci/Setup-MinGW + - bash -lc 'sh .gitlab-ci/setup_mingw.sh' - .gitlab-ci/Install-7-Zip - .gitlab-ci/Fetch-W3C-Tests script: - bash -lc 'sh .gitlab-ci/test.sh' cache: - key: "${MINGW_PACKAGE_PREFIX}msys" + key: "$MSYSTEM" paths: - libxml2-build/xmlconf/ - 7za.exe @@ -76,7 +76,6 @@ mingw:w64-x86_64:shared: variables: CFLAGS: "-O2" MSYSTEM: MINGW64 - MINGW_PACKAGE_PREFIX: mingw-w64-x86_64- MINGW_PATH: mingw64 # Disabled, GCC missing? @@ -143,10 +142,12 @@ cmake:linux:clang:static: .cmake:mingw: tags: - win32-ps + 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" - - .gitlab-ci/Setup-MinGW + - bash -lc 'sh .gitlab-ci/setup_mingw.sh' - .gitlab-ci/Install-7-Zip - .gitlab-ci/Fetch-W3C-Tests script: @@ -157,15 +158,15 @@ cmake:linux:clang:static: - cd libxml2-build - ctest -VV after_script: - - .\7za.exe a libxml2-$Env:CI_COMMIT_SHORT_SHA-$Env:MINGW_PACKAGE_PREFIX$Env:SUFFIX.7z .\libxml2-install\* + - .\7za.exe a libxml2-$Env:CI_COMMIT_SHORT_SHA-$Env:MSYSTEM-$Env:SUFFIX.7z .\libxml2-install\* cache: - key: "${MINGW_PACKAGE_PREFIX}msys" + key: "$MSYSTEM" paths: - libxml2-build/xmlconf/ - 7za.exe artifacts: paths: - - libxml2-$Env:CI_COMMIT_SHORT_SHA-$Env:MINGW_PACKAGE_PREFIX$Env:SUFFIX.7z + - libxml2-$Env:CI_COMMIT_SHORT_SHA-$Env:MSYSTEM-$Env:SUFFIX.7z expire_in: 1 day cmake:mingw:w64-i686:shared: @@ -174,7 +175,7 @@ cmake:mingw:w64-i686:shared: - schedules variables: BUILD_SHARED_LIBS: "ON" - MINGW_PACKAGE_PREFIX: mingw-w64-i686- + MSYSTEM: MINGW32 MINGW_PATH: mingw32 SUFFIX: shared @@ -184,7 +185,7 @@ cmake:mingw:w64-i686:static: - schedules variables: BUILD_SHARED_LIBS: "OFF" - MINGW_PACKAGE_PREFIX: mingw-w64-i686- + MSYSTEM: MINGW32 MINGW_PATH: mingw32 SUFFIX: static @@ -192,7 +193,7 @@ cmake:mingw:w64-x86_64:shared: extends: .cmake:mingw variables: BUILD_SHARED_LIBS: "ON" - MINGW_PACKAGE_PREFIX: mingw-w64-x86_64- + MSYSTEM: MINGW64 MINGW_PATH: mingw64 SUFFIX: shared @@ -202,7 +203,7 @@ cmake:mingw:w64-x86_64:static: - schedules variables: BUILD_SHARED_LIBS: "OFF" - MINGW_PACKAGE_PREFIX: mingw-w64-x86_64- + MSYSTEM: MINGW64 MINGW_PATH: mingw64 SUFFIX: static |