hotfix/fix finding of rejected cruft files

robert-koch-institut · Mar 11, 2024 · cb3e3d3 · cb3e3d3
1 parent 725373d
commit cb3e3d3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- fix finding of rejected cruft files
+
 ### Security
 
 ## [0.1.0] - 2024-03-11

diff --git a/mex-{{ cookiecutter.project_name }}/.github/workflows/cookiecutter.yml b/mex-{{ cookiecutter.project_name }}/.github/workflows/cookiecutter.yml
@@ -80,10 +80,10 @@ jobs:
           git checkout -b cruft/cookiecutter-template-${template_ref}
           cruft update --skip-apply-ask
           printf '# Changes\n\n- bumped cookiecutter template to %s/commit/%s\n' "$template_url" "$template_ref" > .cruft-pr-body
-          if [[ $(git status --porcelain | grep .rej | wc -c) -ne 0 ]]; then
+          if [[ $(find . -type f -name "*.rej" | wc -l) -ne 0 ]]; then
             printf '\n# Conflicts\n' > .cruft-pr-body
           fi
-          git status --porcelain | grep .rej | awk '{print $2;}' | while read -r line ; do
+          find . -type f -name "*.rej" | while read -r line ; do
             printf '\n```' >> .cruft-pr-body
             cat ${line} >> .cruft-pr-body
             printf '```\n' >> .cruft-pr-body