ci(exclusions): fix loss of untracked list
This commit is contained in:
parent
35940e7584
commit
78a2d309d1
|
|
@ -45,9 +45,9 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
git fetch origin exclusions || true
|
git fetch origin exclusions || true
|
||||||
|
|
||||||
if git show origin/exclusions:exclusions.txt >/dev/null 2>&1; then
|
if git show origin/exclusions:false_positive_exclusions.txt >/dev/null 2>&1; then
|
||||||
# If the exclusions branch and file exist, compare
|
# If the exclusions branch and file exist, compare
|
||||||
if git diff --quiet origin/exclusions -- exclusions.txt; then
|
if git diff --quiet origin/exclusions -- false_positive_exclusions.txt; then
|
||||||
echo "exclusions_changed=false" >> "$GITHUB_OUTPUT"
|
echo "exclusions_changed=false" >> "$GITHUB_OUTPUT"
|
||||||
else
|
else
|
||||||
echo "exclusions_changed=true" >> "$GITHUB_OUTPUT"
|
echo "exclusions_changed=true" >> "$GITHUB_OUTPUT"
|
||||||
|
|
@ -71,10 +71,12 @@ jobs:
|
||||||
git config user.name "Paul Pfeister (automation)"
|
git config user.name "Paul Pfeister (automation)"
|
||||||
git config user.email "code@pfeister.dev"
|
git config user.email "code@pfeister.dev"
|
||||||
|
|
||||||
|
git stash push -m "stash false positive exclusion list" --include-untracked -- false_positive_exclusions.txt
|
||||||
|
|
||||||
git fetch origin exclusions || true # Allows creation of branch if deleted
|
git fetch origin exclusions || true # Allows creation of branch if deleted
|
||||||
git checkout -B exclusions origin/exclusions || (git checkout --orphan exclusions && git rm -rf .)
|
git checkout -B exclusions origin/exclusions || (git checkout --orphan exclusions && git rm -rf .)
|
||||||
|
|
||||||
git add false_positive_exclusions.txt
|
git stash pop || true
|
||||||
|
|
||||||
git commit -m "auto: update exclusions list" || echo "No changes to commit"
|
git commit -m "auto: update exclusions list" || echo "No changes to commit"
|
||||||
git push origin exclusions
|
git push origin exclusions
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue