Skip to content

Commit eacee56

Browse files
committed
adjust export-ignore checking in deleted files action
This makes use of git check-attr to properly check the attributes. The attributes have been extended to match subdirs and files.
1 parent 52b0065 commit eacee56

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.gitattributes

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@
88
.git export-ignore
99
.gitattributes export-ignore
1010
.github export-ignore
11+
.github/** export-ignore
1112
.gitignore export-ignore
1213
.editorconfig export-ignore
1314
.travis.yml export-ignore
1415
appveyor.yml export-ignore
1516
composer.json export-ignore
1617
composer.lock export-ignore
1718
_test export-ignore
18-
_cs export-ignore
19+
_test/** export-ignore
1920
lib/plugins/testing export-ignore

.github/workflows/deletedFiles.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Update deleted files
2222
run: |
2323
for F in $(git diff origin/stable..HEAD --summary | awk '/^ delete/ && $4 !~ /^(VERSION)/ {print $4}'); do
24-
if grep -q "^$F export-ignore" .gitattributes; then
24+
if (git check-attr export-ignore "$F" | grep -q "export-ignore: set"); then
2525
continue
2626
fi
2727
if grep -q "^$F" data/deleted.files; then

0 commit comments

Comments
 (0)