matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[action] Update automerge version, change log level and change auto cherry-pick branch name. (#12455)

Browse Source
This commit is contained in:
Liu Shilong 2022-10-20 13:03:39 +08:00 committed by GitHub
parent 010f9203f2
commit 357c1eaa1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/automerge.yml vendored
View File

@ -13,12 +13,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: automerge
uses: 'pascalgn/automerge-action@v0.13.1'
with:
args: "--trace"
uses: 'pascalgn/automerge-action@v0.15.5'
env:
GITHUB_TOKEN: '${{ secrets.TOKEN }}'
MERGE_LABELS: 'automerge'
MERGE_METHOD: 'squash'
MERGE_FILTER_AUTHOR: 'mssonicbld'
MERGE_DELETE_BRANCH: true
LOG: "TRACE"

4
.github/workflows/pr_cherrypick_prestep.yml vendored
View File

@ -104,8 +104,8 @@ jobs:
echo 'Add commnet "@${author} PR conflicts with $branch branch"'
else
# Create PR to release branch
git push mssonicbld HEAD:$branch-${pr_id} -f
result=$(gh pr create -R ${repository} -H mssonicbld:$branch-${pr_id} -B $branch -t "[action] [PR:$pr_id] $title" -b '' 2>&1)
git push mssonicbld HEAD:cherry/$branch/${pr_id} -f
result=$(gh pr create -R ${repository} -H mssonicbld:cherry/$branch/${pr_id} -B $branch -t "[action] [PR:$pr_id] $title" -b '' 2>&1)
echo $result | grep "already exists" && { echo $result; return 0; }
echo $result | grep github.com || { echo $result; return 1; }
new_pr_rul=$(echo $result | grep github.com)