diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2020-09-28 11:31:20 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-10-01 07:32:23 -0400 |
| commit | 1853201bfa53165ab9f27071e93a29a4313e1305 (patch) | |
| tree | d483abf25c96a527935d05d84d26e9bb8dac5b97 /.gitlab/os-linux.yml | |
| parent | bd83c9f073b63b3bfa25a69c7ead9524f1810543 (diff) | |
| download | cmake-1853201bfa53165ab9f27071e93a29a4313e1305.tar.gz | |
gitlab-ci: hide modern whitespace attribute usage from old Git versions
The old Git doesn't understand our new `eol=` attribute usage, so make
it not care about the difference.
Diffstat (limited to '.gitlab/os-linux.yml')
| -rw-r--r-- | .gitlab/os-linux.yml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 552aabdf37..19b81d759f 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -224,6 +224,11 @@ - echo "CMake_TEST_INSTALL:BOOL=OFF" >> build/CMakeCache.txt - echo "CMAKE_INSTALL_PREFIX:PATH=$PWD/build/install" >> build/CMakeCache.txt - echo "CMAKE_SKIP_INSTALL_ALL_DEPENDENCY:BOOL=ON" >> build/CMakeCache.txt + # Appease Git. The Git in this container is old (1.7) and doesn't + # understand some things. But, it doesn't need to, so make it blind. + - mkdir -p .git/info + - echo "* -crlf" >> .git/info/attributes + - git reset --hard # Bootstrap - cd build/ - '$LAUNCHER ../bootstrap --parallel=$(nproc) --docdir=doc/cmake -- "-DCMake_DOC_ARTIFACT_PREFIX=$CI_PROJECT_DIR/build/install-doc"' @@ -256,6 +261,11 @@ - echo "CMake_TEST_INSTALL:BOOL=OFF" >> build/CMakeCache.txt - echo "CMAKE_INSTALL_PREFIX:PATH=$PWD/build/install" >> build/CMakeCache.txt - echo "CMAKE_SKIP_INSTALL_ALL_DEPENDENCY:BOOL=ON" >> build/CMakeCache.txt + # Appease Git. The Git in this container is old (1.7) and doesn't + # understand some things. But, it doesn't need to, so make it blind. + - mkdir -p .git/info + - echo "* -crlf" >> .git/info/attributes + - git reset --hard # Bootstrap - cd build/ - "$LAUNCHER ../bootstrap --parallel=$(nproc) --docdir=doc/cmake" |