Skip to content

Commit

Permalink
Try again
Browse files Browse the repository at this point in the history
  • Loading branch information
Universal-Omega authored Mar 20, 2024
1 parent c888484 commit 5804223
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions .github/workflows/puppet-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@ jobs:
git checkout -b ${GITHUB_HEAD_REF}
git add .
git commit -am "CI: lint puppet code to standards" -m "Check commit and GitHub actions for more details"
# Check for uncommitted changes
if git status --porcelain | grep .; then
git stash push -m "Stashing uncommitted changes"
fi
# Fetch latest changes before rebase
git fetch origin
git rebase origin/${GITHUB_HEAD_REF}
Expand All @@ -51,9 +47,7 @@ jobs:
echo "Conflicts encountered, unable to proceed."
exit 1
fi
git push --set-upstream origin ${GITHUB_HEAD_REF}
# Pop stashed changes if any
git stash pop --quiet
git push --force-with-lease --set-upstream origin ${GITHUB_HEAD_REF}
else
echo "No changes to commit"
fi
Expand Down

0 comments on commit 5804223

Please sign in to comment.