Skip to content

Commit

Permalink
Revert "Per suggestion from @JohnHalleyGotway, create intermediate br…
Browse files Browse the repository at this point in the history
…anch for updating truth data to avoid branch protection rules. I added a step to delete the intermediate branch locally if it exists to prevent conflicts with the update"

This reverts commit 525809d.
  • Loading branch information
georgemccabe committed Feb 15, 2024
1 parent bb90bc8 commit 2f2004a
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions .github/workflows/update_truth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,10 @@ jobs:
git config --global user.email "97135045+metplus-bot@users.noreply.github.com"
echo git checkout ${branch_name}
git checkout ${branch_name}
echo git checkout -d update_truth_for_${branch_name} (delete local if exists)
git checkout -d update_truth_for_${branch_name}
echo git checkout -b update_truth_for_${branch_name} (create from ${branch_name})
git checkout -b update_truth_for_${branch_name}
echo git merge -s ours origin/${branch_name}-ref
git merge -s ours origin/${branch_name}-ref
echo git push origin update_truth_for_${branch_name}
git push origin update_truth_for_${branch_name}
echo git push origin ${branch_name}
git push origin ${branch_name}
- name: Create Pull Request
run: gh pr create --base $BASE --body "$BODY" --title "$TITLE"
Expand Down

0 comments on commit 2f2004a

Please sign in to comment.