diff options
| author | Brad King <brad.king@kitware.com> | 2022-11-02 14:16:41 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-11-02 17:17:02 -0400 |
| commit | 3624295c9bef4562408110443214fcb048897247 (patch) | |
| tree | 153c6fdb86afff3cef416e27f71c67b032ce3119 | |
| parent | 01c58daec73ec3c78f9115d8055f6e16347f8446 (diff) | |
| download | cmake-3624295c9bef4562408110443214fcb048897247.tar.gz | |
ci: add MSYS Makefiles nightly CI job
Use the MinGW/MSYS 1.0 distribution from `mingw.osdn.io`.
| -rw-r--r-- | .gitlab-ci.yml | 14 | ||||
| -rw-r--r-- | .gitlab/ci/configure_mingw_osdn_io_msys_makefiles.cmake | 1 | ||||
| -rwxr-xr-x | .gitlab/ci/env_mingw_osdn_io_msys_makefiles.ps1 | 5 | ||||
| -rwxr-xr-x | .gitlab/ci/mingw.ps1 | 2 | ||||
| -rw-r--r-- | .gitlab/os-windows.yml | 7 |
5 files changed, 29 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 387a720f9f..7f732a082a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1074,6 +1074,20 @@ t:mingw_osdn_io-mingw_makefiles: variables: CMAKE_CI_JOB_NIGHTLY: "true" +t:mingw_osdn_io-msys_makefiles: + extends: + - .mingw_osdn_io_msys_makefiles + - .cmake_test_windows_external + - .windows_tags_concurrent + - .cmake_junit_artifacts + - .run_dependent + dependencies: + - t:windows-vs2022-x64-ninja + needs: + - t:windows-vs2022-x64-ninja + variables: + CMAKE_CI_JOB_NIGHTLY: "true" + t:windows-msvc-v71-nmake: extends: - .windows_msvc_v71_nmake diff --git a/.gitlab/ci/configure_mingw_osdn_io_msys_makefiles.cmake b/.gitlab/ci/configure_mingw_osdn_io_msys_makefiles.cmake new file mode 100644 index 0000000000..5ddd410be6 --- /dev/null +++ b/.gitlab/ci/configure_mingw_osdn_io_msys_makefiles.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/configure_mingw_osdn_io_common.cmake") diff --git a/.gitlab/ci/env_mingw_osdn_io_msys_makefiles.ps1 b/.gitlab/ci/env_mingw_osdn_io_msys_makefiles.ps1 new file mode 100755 index 0000000000..6eccb720a3 --- /dev/null +++ b/.gitlab/ci/env_mingw_osdn_io_msys_makefiles.ps1 @@ -0,0 +1,5 @@ +$pwdpath = $pwd.Path +& "$pwsh" -File ".gitlab/ci/mingw.ps1" +Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\mingw\msys\1.0\bin;$pwdpath\.gitlab\mingw\bin;$env:PATH" +$env:MSYSTEM = 'MINGW32' +$env:MAKE_MODE = 'unix' diff --git a/.gitlab/ci/mingw.ps1 b/.gitlab/ci/mingw.ps1 index 672b993a2e..a1b5b110ee 100755 --- a/.gitlab/ci/mingw.ps1 +++ b/.gitlab/ci/mingw.ps1 @@ -21,3 +21,5 @@ Add-Type -AssemblyName System.IO.Compression.FileSystem [System.IO.Compression.ZipFile]::ExtractToDirectory("$outdir\$tarball", "$outdir") Move-Item -Path "$outdir\$filename" -Destination "$outdir\mingw" Remove-Item "$outdir\$tarball" + +"$outdir/mingw /mingw" -replace '\\', '/' | Out-File -FilePath "$outdir\mingw\msys\1.0\etc\fstab" -Encoding ASCII diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index 8ba4cc4ba1..271610b2ad 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -252,6 +252,13 @@ CMAKE_CONFIGURATION: mingw_osdn_io_mingw_makefiles CMAKE_GENERATOR: "MinGW Makefiles" +.mingw_osdn_io_msys_makefiles: + extends: .mingw_osdn_io + + variables: + CMAKE_CONFIGURATION: mingw_osdn_io_msys_makefiles + CMAKE_GENERATOR: "MSYS Makefiles" + ## Tags .windows_tags_nonconcurrent_vs2022: |