From 2bd4e95bf120f10c818c237fdf8ce4dcf3edb949 Mon Sep 17 00:00:00 2001 From: Alano Terblanche <18033717+Benehiko@users.noreply.github.com> Date: Tue, 2 Jul 2024 11:53:42 +0200 Subject: [PATCH 1/2] feat: force lf line endings by default Signed-off-by: Alano Terblanche <18033717+Benehiko@users.noreply.github.com> --- .gitattributes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitattributes b/.gitattributes index 4f1544141a..633021a07c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,5 @@ +* text=auto eol=lf Dockerfile* linguist-language=Dockerfile vendor.mod linguist-language=Go-Module vendor.sum linguist-language=Go-Checksums +*.bat text eol=crlf From c56f4a1ef7e51fde7f7eb1ad4fef62d0164a0f9a Mon Sep 17 00:00:00 2001 From: Alano Terblanche <18033717+Benehiko@users.noreply.github.com> Date: Wed, 3 Jul 2024 13:43:07 +0200 Subject: [PATCH 2/2] workflow: remove git `autocrlf=false` setup on windows Signed-off-by: Alano Terblanche <18033717+Benehiko@users.noreply.github.com> --- .github/workflows/test.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2bd51e576f..8645e35a07 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -49,12 +49,6 @@ jobs: - macos-12 # - windows-2022 # FIXME: some tests are failing on the Windows runner, as well as on Appveyor since June 24, 2018: https://ci.appveyor.com/project/docker/cli/history steps: - - - name: Prepare git - if: matrix.os == 'windows-latest' - run: | - git config --system core.autocrlf false - git config --system core.eol lf - name: Checkout uses: actions/checkout@v4