Skip to content

Commit

Permalink
Recent changes to branch protection rules for the develop branch have…
Browse files Browse the repository at this point in the history
… broken the logic of the update_truth.yml GHA workflow. Instead of submitting a PR to merge develop into develop-ref directly, use an intermediate update_truth_for_develop branch.
  • Loading branch information
JohnHalleyGotway committed Feb 15, 2024
1 parent c788602 commit 67ee04e
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/update_truth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,12 @@ jobs:
git config --global user.email "[email protected]"
echo git checkout ${branch_name}
git checkout ${branch_name}
echo git checkout -b update_truth_for_${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 ${branch_name}
git push origin ${branch_name}
echo git push origin update_truth_for_${branch_name}
git push origin update_truth_for_${branch_name}
- name: Create Pull Request
run: gh pr create --base $BASE --body "$BODY" --title "$TITLE"
Expand Down

0 comments on commit 67ee04e

Please sign in to comment.