Просмотр исходного кода

Merge topic 'ci-sccache-port-from-runner' into release-4.2

cb865362ed gitlab-ci: get the sccache server port from the runner

Acked-by: Kitware Robot <[email protected]>
Merge-request: !11560
Brad King 2 недель назад
Родитель
Сommit
77371c0779
2 измененных файлов с 0 добавлено и 4 удалено
  1. 0 2
      .gitlab/os-macos.yml
  2. 0 2
      .gitlab/os-windows.yml

+ 0 - 2
.gitlab/os-macos.yml

@@ -8,8 +8,6 @@
         # TODO: Factor this out so that each job selects the Xcode version to
         # use so that different versions can be tested in a single pipeline.
         DEVELOPER_DIR: "/Applications/Xcode-26.1.app/Contents/Developer"
-        # Avoid conflicting with other projects running on the same machine.
-        SCCACHE_SERVER_PORT: 4227
 
 ### Build and test
 

+ 0 - 2
.gitlab/os-windows.yml

@@ -5,8 +5,6 @@
 .windows:
     variables:
         GIT_CLONE_PATH: "$CI_BUILDS_DIR\\cmake ci ext\\$CI_CONCURRENT_ID"
-        # Avoid conflicting with other projects running on the same machine.
-        SCCACHE_SERVER_PORT: 4227
 
 ### Build and test