Fix merge change log workflow (#4366)
This commit is contained in:
parent
1af8cea40b
commit
7a60c445e4
|
|
@ -8,6 +8,8 @@ jobs:
|
|||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
# this workflow is run against the release branch (see usage of GITHUB_REF_NAME below)
|
||||
# but it is creating a pull request against main
|
||||
ref: main
|
||||
# history is needed to run format-patch below
|
||||
fetch-depth: 0
|
||||
|
|
@ -22,7 +24,7 @@ jobs:
|
|||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: |
|
||||
git format-patch --stdout main..$GITHUB_REF_NAME CHANGELOG.md | git apply
|
||||
git format-patch --stdout HEAD..origin/$GITHUB_REF_NAME CHANGELOG.md | git apply
|
||||
msg="Merge change log updates from $GITHUB_REF_NAME to main"
|
||||
git commit -a -m "$msg"
|
||||
git push origin HEAD:merge-change-log-updates-to-main
|
||||
|
|
|
|||
Loading…
Reference in New Issue