diff options
| author | Brad King <brad.king@kitware.com> | 2022-11-11 16:43:56 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-11-11 20:05:30 (GMT) |
| commit | 1ccffcf0ea1b0d49fe723bc7d08083f5767c1e20 (patch) | |
| tree | 2f1ec2cbd31272601413d9f948469bac2f204c01 /.gitlab | |
| parent | 781303c0e263b2497829a8f7c2160d223faa8509 (diff) | |
| download | CMake-1ccffcf0ea1b0d49fe723bc7d08083f5767c1e20.zip CMake-1ccffcf0ea1b0d49fe723bc7d08083f5767c1e20.tar.gz CMake-1ccffcf0ea1b0d49fe723bc7d08083f5767c1e20.tar.bz2 | |
ci: Factor out helper to load python into environment on Windows
Diffstat (limited to '.gitlab')
| -rwxr-xr-x | .gitlab/ci/python-env.ps1 | 4 | ||||
| -rw-r--r-- | .gitlab/os-windows.yml | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/.gitlab/ci/python-env.ps1 b/.gitlab/ci/python-env.ps1 new file mode 100755 index 0000000..4e897d8 --- /dev/null +++ b/.gitlab/ci/python-env.ps1 @@ -0,0 +1,4 @@ +$pwdpath = $pwd.Path +cmake -P .gitlab/ci/download_python3.cmake +Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\python3;$env:PATH" +python --version diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index eb063f8..ca46612 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -305,9 +305,7 @@ - (& "$env:WIX\bin\light.exe" -help) | Select -First 1 - cmake --version - . .gitlab/ci/qt-env.ps1 - - cmake -P .gitlab/ci/download_python3.cmake - - Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\python3;$env:PATH" - - python --version + - . .gitlab/ci/python-env.ps1 .cmake_build_windows: stage: build |