Browse Source

Merge topic 'rel-zip-newlines'

b0315c83dc ci: package .zip source archives using LF newlines
8b16de9e84 ci: package source archives using consistent command-line quoting conventions

Acked-by: Kitware Robot <[email protected]>
Reviewed-by: Ben Boeckel <[email protected]>
Acked-by: scivision <[email protected]>
Merge-request: !9393
Brad King 1 năm trước cách đây
mục cha
commit
a712d0faa4
2 tập tin đã thay đổi với 8 bổ sung2 xóa
  1. 2 2
      .gitlab/os-linux.yml
  2. 6 0
      Help/release/dev/rel-zip-newlines.rst

+ 2 - 2
.gitlab/os-linux.yml

@@ -508,8 +508,8 @@
         - dnf install --setopt=install_weak_deps=False -y git-core
         - v="$(.gitlab/ci/cmake_version.sh)"
         - mkdir -p build/
-        - git archive --format=tgz "--prefix=cmake-$v/" -o "build/cmake-$v.tar.gz" HEAD
-        - git -c core.autocrlf=true -c core.eol=crlf archive --format=zip --prefix="cmake-$v/" -o "build/cmake-$v.zip" HEAD
+        - git archive --format=tgz --prefix="cmake-$v/" -o "build/cmake-$v.tar.gz" HEAD
+        - git archive --format=zip --prefix="cmake-$v/" -o "build/cmake-$v.zip" HEAD
 
     interruptible: true
 

+ 6 - 0
Help/release/dev/rel-zip-newlines.rst

@@ -0,0 +1,6 @@
+rel-zip-newlines
+----------------
+
+* The official ``.zip`` source archive provided on
+  `cmake.org <https://cmake.org/download/>`_ now uses LF newlines,
+  instead of CRLF newlines, for consistency with modern conventions.