From 1853201bfa53165ab9f27071e93a29a4313e1305 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 28 Sep 2020 11:31:20 -0400 Subject: 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. --- .gitlab/os-linux.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 552aabd..19b81d7 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" -- cgit v0.12