status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore(ci): squash backport-assistant commits in PRs

This commit is contained in:
DanStough 2022-05-19 12:24:54 -04:00 committed by Dan Stough
parent 4f17f3ba44
commit 8b88ad873f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/backport-assistant.yml vendored
View File

@ -20,7 +20,7 @@ jobs:
steps: steps:
- name: Run Backport Assistant for stable-website - name: Run Backport Assistant for stable-website
run: | run: |
backport-assistant backport -merge-method=rebase -automerge backport-assistant backport -merge-method=squash -automerge
env: env:
BACKPORT_LABEL_REGEXP: "type/docs-(?P<target>cherrypick)" BACKPORT_LABEL_REGEXP: "type/docs-(?P<target>cherrypick)"
BACKPORT_TARGET_TEMPLATE: "stable-website" BACKPORT_TARGET_TEMPLATE: "stable-website"
@ -39,13 +39,13 @@ jobs:
# set BACKPORT_TARGET_TEMPLATE for backport-assistant # set BACKPORT_TARGET_TEMPLATE for backport-assistant
# trims backport/ from the beginning with parameter substitution # trims backport/ from the beginning with parameter substitution
export BACKPORT_TARGET_TEMPLATE="release/${latest_backport_label#backport/}.x" export BACKPORT_TARGET_TEMPLATE="release/${latest_backport_label#backport/}.x"
backport-assistant backport -merge-method=rebase -automerge backport-assistant backport -merge-method=squash -automerge
env: env:
BACKPORT_LABEL_REGEXP: "type/docs-(?P<target>cherrypick)" BACKPORT_LABEL_REGEXP: "type/docs-(?P<target>cherrypick)"
GITHUB_TOKEN: ${{ secrets.ELEVATED_GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
- name: Run Backport Assistant for release branches - name: Run Backport Assistant for release branches
run: | run: |
backport-assistant backport -merge-method=rebase -automerge backport-assistant backport -merge-method=squash -automerge
env: env:
BACKPORT_LABEL_REGEXP: "backport/(?P<target>\\d+\\.\\d+)" BACKPORT_LABEL_REGEXP: "backport/(?P<target>\\d+\\.\\d+)"
BACKPORT_TARGET_TEMPLATE: "release/{{.target}}.x" BACKPORT_TARGET_TEMPLATE: "release/{{.target}}.x"