Skip to content

Commit

Permalink
Test
Browse files Browse the repository at this point in the history
  • Loading branch information
cPu1 committed Aug 21, 2023
1 parent 26dd422 commit 97672b6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release-merge2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@ jobs:
git checkout -b merge-${{ github.sha }}
if [ "$(git merge --no-commit --no-ff ${{ github.ref }})" = "Already up to date." ]; then
echo "Exiting";
echo "changes=false" >> $GITHUB_OUTPUT
exit 0;
fi
git checkout ORIG_HEAD -- $VERSION_FILE
git add $VERSION_FILE
EDITOR=true git merge --continue
! git diff --exit-code $DEFAULT_BRANCH...HEAD || exit 1
git push --set-upstream origin HEAD
echo "changes=true" >> $GITHUB_OUTPUT
- uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 #v6.4.1
name: Open PR to ${{env.DEFAULT_BRANCH}}
if: steps.merge-changes.outputs.changes != 'false'
if: steps.merge-changes.outputs.changes == 'true'
with:
github-token: ${{ secrets.EKSCTLBOT_TOKEN }}
script: |
Expand Down

0 comments on commit 97672b6

Please sign in to comment.