diff options
| author | Brad King <brad.king@kitware.com> | 2020-05-27 18:06:36 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-05-27 18:06:43 (GMT) |
| commit | 7a40d87036afa10b9ebcefa3ec971072eb456e71 (patch) | |
| tree | 32f9abdf899b04c29e51daab16c338306cd3f9c0 | |
| parent | 08f1ee1f5321f5eabfec7b0ce9f565e58cd590be (diff) | |
| parent | dc2f964e16cbf5cfc70772fcdaba6846df252b79 (diff) | |
| download | CMake-7a40d87036afa10b9ebcefa3ec971072eb456e71.zip CMake-7a40d87036afa10b9ebcefa3ec971072eb456e71.tar.gz CMake-7a40d87036afa10b9ebcefa3ec971072eb456e71.tar.bz2 | |
Merge topic 'gitlab-ci-dir'
dc2f964e16 gitlab-ci: Use stable build path on Windows
fb20f4f70b gitlab-ci: Use a shorter work directory
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4807
| -rw-r--r-- | .gitlab-ci.yml | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a8b31da..a5dde59 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,13 +17,13 @@ image: "kitware/cmake:ci-fedora31-x86_64-2020-05-08" variables: - GIT_CLONE_PATH: "$CI_BUILDS_DIR/gitlab-kitware-cmake ci" + GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" .debian10: &debian10 image: "kitware/cmake:ci-debian10-x86_64-2020-04-27" variables: - GIT_CLONE_PATH: "$CI_BUILDS_DIR/gitlab-kitware-cmake ci" + GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" .debian10_iwyu: &debian10_iwyu extends: .debian10 @@ -72,7 +72,7 @@ # change between the build and test stages which CMake doesn't support. # Even if we could, it could change if other runners on the machine # could run at the same time, so we drop it. - GIT_CLONE_PATH: "$CI_BUILDS_DIR/gitlab-kitware-cmake ci" + GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" .macos_ninja: &macos_ninja extends: .macos @@ -96,8 +96,7 @@ # change between the build and test stages which CMake doesn't support. # Even if we could, it could change if other runners on the machine # could run at the same time, so we drop it. - # Blocked on https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/2122 - #GIT_CLONE_PATH: "$CI_BUILDS_DIR\\gitlab-kitware-cmake ci" + GIT_CLONE_PATH: "$CI_BUILDS_DIR\\cmake ci" .windows_ninja: &windows_ninja extends: .windows |