Skip to content

Commit

Permalink
fix: branch creation & delete branch after merge
Browse files Browse the repository at this point in the history
  • Loading branch information
bastiandoetsch committed Jun 20, 2024
1 parent a132c2f commit 75be44f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .github/create-cli-pr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
set -ex

CLI_DIR=$(mktemp -d)
gh repo clone [email protected]:snyk/cli.git $CLI_DIR -- --depth=1
gh repo clone [email protected]:snyk/cli.git $CLI_DIR
pushd "$CLI_DIR/cliv2"
LS_COMMIT_HASH=$(grep snyk-ls go.mod| cut -d "-" -f 4)
popd
Expand All @@ -30,7 +30,7 @@ pushd $CLI_DIR
UPGRADE=$(go run scripts/upgrade-snyk-go-dependencies.go --name=snyk-ls)
LS_VERSION=$(echo $UPGRADE | sed 's/.*Sha: \(.*\) URL.*/\1/')
BRANCH=feat/automatic-upgrade-of-ls
git checkout -b $BRANCH
git checkout $BRANCH || git checkout -b $BRANCH

git config --global user.email "[email protected]"
git config --global user.name "Snyk Team IDE"
Expand All @@ -51,5 +51,5 @@ pushd $CLI_DIR
else
gh pr edit $PR --repo github.com/snyk/cli --body "$BODY"
fi
gh pr merge -m --auto
gh pr merge -m --auto --delete-branch
popd

0 comments on commit 75be44f

Please sign in to comment.