From 1ccffcf0ea1b0d49fe723bc7d08083f5767c1e20 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 11 Nov 2022 11:43:56 -0500 Subject: ci: Factor out helper to load python into environment on Windows --- .gitlab/ci/python-env.ps1 | 4 ++++ .gitlab/os-windows.yml | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100755 .gitlab/ci/python-env.ps1 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 -- cgit v0.12