From 548a383659705937d0e8bfd6179847beaaaeb82e Mon Sep 17 00:00:00 2001 From: Eliah Kagan Date: Tue, 24 Sep 2024 09:35:36 +0000 Subject: [PATCH 1/4] Tell github-linguist to count fixture shell scripts --- .gitattributes | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitattributes b/.gitattributes index 50d83ecdfbc..8602f1fb954 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,5 +4,8 @@ **/tests/fixtures/**/*.sh text crlf=input eol=lf /justfile text crlf=input eol=lf +# have GitHub include fixture-making scripts when it counts code +**/tests/fixtures/**/*.sh linguist-vendored=false + # have GitHub treat the gix-packetline-blocking src copy as auto-generated gix-packetline-blocking/src/ linguist-generated=true From bfe363c7b719fd407b57e4c48f6764715b5529d7 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Tue, 24 Sep 2024 16:31:34 +0200 Subject: [PATCH 2/4] always run everything on CI to prevent never-succeeding CI (#1608) Fixes #1608. --- .github/workflows/ci.yml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e27397b6f9c..d60d50308fa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,29 +12,9 @@ on: - '**/run-ci/**' tags-ignore: - '*' - paths: - - '.github/**' - - 'ci/**' - - 'etc/**' - - 'src/**' - - 'tests/**' - - 'cargo-*/**' - - 'gix*/**' - - '*.toml' - - Makefile pull_request: branches: - main - paths: - - '.github/**' - - 'ci/**' - - 'etc/**' - - 'src/**' - - 'tests/**' - - 'cargo-*/**' - - 'gix*/**' - - '*.toml' - - Makefile workflow_dispatch: jobs: From a75e97080df22c9fcc3fd79b9f0b03aeb8f5fbe1 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Tue, 24 Sep 2024 16:32:20 +0200 Subject: [PATCH 3/4] simplify .gitattributes This was brought up in #1607 and I think it's preferable. --- .gitattributes | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitattributes b/.gitattributes index 8602f1fb954..f307bd391f2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,11 +1,11 @@ -**/generated-archives/*.tar* filter=lfs-disabled diff=lfs merge=lfs -text +generated-archives/*.tar* filter=lfs-disabled diff=lfs merge=lfs -text # assure line feeds don't interfere with our working copy hash -**/tests/fixtures/**/*.sh text crlf=input eol=lf +tests/fixtures/**/*.sh text crlf=input eol=lf /justfile text crlf=input eol=lf # have GitHub include fixture-making scripts when it counts code -**/tests/fixtures/**/*.sh linguist-vendored=false +tests/fixtures/**/*.sh linguist-vendored=false # have GitHub treat the gix-packetline-blocking src copy as auto-generated gix-packetline-blocking/src/ linguist-generated=true From d3c3237a8829e1e2ccac7882432c1cfdce7b4db0 Mon Sep 17 00:00:00 2001 From: Eliah Kagan Date: Tue, 24 Sep 2024 16:42:29 -0400 Subject: [PATCH 4/4] Revert "simplify .gitattributes" This reverts commit a75e97080df22c9fcc3fd79b9f0b03aeb8f5fbe1. That change to `.gitattributes`, though intended as a refactoring, caused the currently committed generated archives not to be able to be used, producing Windows `test-fast` failures similar to #1358. See comments in #1607 for details. --- .gitattributes | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitattributes b/.gitattributes index f307bd391f2..8602f1fb954 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,11 +1,11 @@ -generated-archives/*.tar* filter=lfs-disabled diff=lfs merge=lfs -text +**/generated-archives/*.tar* filter=lfs-disabled diff=lfs merge=lfs -text # assure line feeds don't interfere with our working copy hash -tests/fixtures/**/*.sh text crlf=input eol=lf +**/tests/fixtures/**/*.sh text crlf=input eol=lf /justfile text crlf=input eol=lf # have GitHub include fixture-making scripts when it counts code -tests/fixtures/**/*.sh linguist-vendored=false +**/tests/fixtures/**/*.sh linguist-vendored=false # have GitHub treat the gix-packetline-blocking src copy as auto-generated gix-packetline-blocking/src/ linguist-generated=true