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 <[email protected]>
Merge-request: !4807

.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