From f36abc19fd8a5790427bb756faec911e85779373 Mon Sep 17 00:00:00 2001 From: Bastian Doetsch Date: Wed, 19 Jun 2024 15:58:35 +0200 Subject: [PATCH 1/2] feat: enable auto-merge on CLI PRs --- .github/create-cli-pr.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/create-cli-pr.sh b/.github/create-cli-pr.sh index 3ddb9ac0a..8713590de 100755 --- a/.github/create-cli-pr.sh +++ b/.github/create-cli-pr.sh @@ -39,4 +39,5 @@ pushd $CLI_DIR COMMIT_HASH=$(git log --pretty=tformat:"%h" -n1 .) gh pr create --repo github.com/snyk/cli --base main --head $BRANCH --title "feat(language-server): integrate LS ($LS_VERSION)" --body "$(echo $UPGRADE | sed 's/.*Message: \(.*\) URL.*$/\1/')" + gh pr merge --auto popd From 7a1219acaace8b505a2a3b996e93c7407d640dd5 Mon Sep 17 00:00:00 2001 From: Bastian Doetsch Date: Wed, 19 Jun 2024 16:02:13 +0200 Subject: [PATCH 2/2] fix: add method of auto-merging --- .github/create-cli-pr.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/create-cli-pr.sh b/.github/create-cli-pr.sh index 8713590de..068fa080d 100755 --- a/.github/create-cli-pr.sh +++ b/.github/create-cli-pr.sh @@ -39,5 +39,5 @@ pushd $CLI_DIR COMMIT_HASH=$(git log --pretty=tformat:"%h" -n1 .) gh pr create --repo github.com/snyk/cli --base main --head $BRANCH --title "feat(language-server): integrate LS ($LS_VERSION)" --body "$(echo $UPGRADE | sed 's/.*Message: \(.*\) URL.*$/\1/')" - gh pr merge --auto + gh pr merge -m --auto popd