Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-16 22:37:30 +08:00
Code Issues Projects Releases Wiki Activity

ci: rename pre-build step to pre-configure since that is when it runs

Browse Source
This commit is contained in:
Brad King
2025-10-03 18:12:45 -04:00
parent 0d01bc72b8
commit 206b831973
7 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab/ci/pre_build.ps1
View File

@@ -1,4 +0,0 @@
$pwsh = [System.Diagnostics.Process]::GetCurrentProcess().MainModule.FileName
if (Test-Path -Path ".gitlab/ci/pre_build_$env:CMAKE_CONFIGURATION.ps1" -PathType Leaf) {
. ".gitlab/ci/pre_build_$env:CMAKE_CONFIGURATION.ps1"
}

4
.gitlab/ci/pre_configure.ps1 Normal file
View File

@@ -0,0 +1,4 @@
$pwsh = [System.Diagnostics.Process]::GetCurrentProcess().MainModule.FileName
if (Test-Path -Path ".gitlab/ci/pre_configure_$env:CMAKE_CONFIGURATION.ps1" -PathType Leaf) {
. ".gitlab/ci/pre_configure_$env:CMAKE_CONFIGURATION.ps1"
}

4
.gitlab/ci/pre_build.sh → .gitlab/ci/pre_configure.sh
View File

@@ -13,6 +13,6 @@ quietly() {
rm -f "$log"
}
if test -r ".gitlab/ci/pre_build_${CMAKE_CONFIGURATION}.sh"; then
source ".gitlab/ci/pre_build_${CMAKE_CONFIGURATION}.sh"
if test -r ".gitlab/ci/pre_configure_${CMAKE_CONFIGURATION}.sh"; then
source ".gitlab/ci/pre_configure_${CMAKE_CONFIGURATION}.sh"
fi

0
.gitlab/ci/pre_build_fedora42_tidy.sh → .gitlab/ci/pre_configure_fedora42_tidy.sh
View File

2
.gitlab/os-linux.yml
View File

@@ -715,7 +715,7 @@
- .gitlab/ci/sccache.sh
- sccache --start-server
- sccache --show-stats
- .gitlab/ci/pre_build.sh
- .gitlab/ci/pre_configure.sh
- "$LAUNCHER ctest -VV -S .gitlab/ci/ctest_configure.cmake"
- "$LAUNCHER ctest -VV -S .gitlab/ci/ctest_build.cmake"
- .gitlab/ci/post_build.sh

2
.gitlab/os-macos.yml
View File

@@ -200,7 +200,7 @@
# Allow the server to already be running.
- "sccache --start-server || :"
- sccache --show-stats
- .gitlab/ci/pre_build.sh
- .gitlab/ci/pre_configure.sh
- ctest -VV -S .gitlab/ci/ctest_configure.cmake
- ctest -VV -S .gitlab/ci/ctest_build.cmake
- .gitlab/ci/post_build.sh

2
.gitlab/os-windows.yml
View File

@@ -443,7 +443,7 @@
- Invoke-Expression -Command .gitlab/ci/vcvarsall.ps1
- sccache --start-server
- sccache --show-stats
- (& "$pwsh" -File ".gitlab/ci/pre_build.ps1")
- (& "$pwsh" -File ".gitlab/ci/pre_configure.ps1")
- ctest -VV -S .gitlab/ci/ctest_configure.cmake
- ctest -VV -S .gitlab/ci/ctest_build.cmake
- (& "$pwsh" -File ".gitlab/ci/post_build.ps1")