Skip to content
Snippets Groups Projects
Commit 901bec0c authored by Ben Boeckel's avatar Ben Boeckel
Browse files

gitlab-ci: checkout ParaView for testing too

This allows the CDash test results to all end up on the same CDash
report.

See: !1167
parent 1a8c3295
No related branches found
No related tags found
No related merge requests found
......@@ -88,8 +88,6 @@
- git submodule foreach --recursive cmake -P "$PWD/.gitlab/ci/fetch_submodule.cmake"
- git submodule sync --recursive
- git submodule update --init --recursive
.before_script_macos_paraview: &before_script_macos_paraview
- .gitlab/ci/checkout_paraview.sh
- export PARAVIEW_COMMIT_SHA=`git -C $CI_PROJECT_DIR/source-paraview rev-parse HEAD`
- export PARAVIEW_COMMIT_SHORT_SHA=`git -C $CI_PROJECT_DIR/source-paraview rev-parse --short HEAD`
......@@ -99,7 +97,6 @@
script:
- *before_script_macos
- *before_script_macos_paraview
- .gitlab/ci/sccache.sh
# Allow the server to already be running.
- "sccache --start-server || :"
......
......@@ -81,6 +81,11 @@
- git submodule foreach --recursive cmake -P "$pwdpath/.gitlab/ci/fetch_submodule.cmake"
- git submodule sync --recursive
- git submodule update --init --recursive
- .gitlab/ci/checkout_paraview.ps1
- git -C $env:CI_PROJECT_DIR\source-paraview rev-parse HEAD | Tee-Object -Variable paraview_commit_sha
- git -C $env:CI_PROJECT_DIR\source-paraview rev-parse --short HEAD | Tee-Object -Variable paraview_commit_short_sha
- Set-Item -Force -Path "env:PARAVIEW_COMMIT_SHA" -Value "$paraview_commit_sha"
- Set-Item -Force -Path "env:PARAVIEW_COMMIT_SHORT_SHA" -Value "$paraview_commit_short_sha"
.before_script_windows_deps: &before_script_windows_deps
- cmake -P .gitlab/ci/download_qt.cmake
......@@ -89,20 +94,12 @@
- Set-Item -Force -Path "env:PATH" -Value "$pwdpath\build\install\Python;$env:PATH;$pwdpath\build\install\bin"
- Set-Item -Force -Path "env:PYTHONHOME" -Value "$pwdpath\build\install\Python"
.before_script_windows_paraview: &before_script_windows_paraview
- .gitlab/ci/checkout_paraview.ps1
- git -C $env:CI_PROJECT_DIR\source-paraview rev-parse HEAD | Tee-Object -Variable paraview_commit_sha
- git -C $env:CI_PROJECT_DIR\source-paraview rev-parse --short HEAD | Tee-Object -Variable paraview_commit_short_sha
- Set-Item -Force -Path "env:PARAVIEW_COMMIT_SHA" -Value "$paraview_commit_sha"
- Set-Item -Force -Path "env:PARAVIEW_COMMIT_SHORT_SHA" -Value "$paraview_commit_short_sha"
.cmake_build_windows:
stage: build
script:
- *before_script_windows
- *before_script_windows_deps
- *before_script_windows_paraview
- Invoke-Expression -Command .gitlab/ci/buildcache.ps1
- Set-Item -Force -Path "env:PATH" -Value "$env:PATH;$pwdpath\.gitlab\buildcache\bin"
- Invoke-Expression -Command .gitlab/ci/vcvarsall.ps1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment