Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update existing PR #556

Merged
merged 5 commits into from
Jun 20, 2024
+16 −7
Merged

feat: update existing PR #556

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
be728dc
feat: update existing PR
bastiandoetsch Jun 20, 2024
a132c2f
fix: syntax error
bastiandoetsch Jun 20, 2024
75be44f
fix: branch creation & delete branch after merge
bastiandoetsch Jun 20, 2024
ef0ec7b
fix: move upgrade down to reuse commits
bastiandoetsch Jun 20, 2024
0aab31d
fix: nothing to commit
bastiandoetsch Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions .github/create-cli-pr.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,20 @@
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

WHAT_CHANGED=$(git whatchanged "$LS_COMMIT_HASH"...HEAD)
BODY=$(printf "## Changes since last integration of Language Server\n\n\`\`\`\n%s\n\`\`\`" "$WHAT_CHANGED")
BRANCH=feat/automatic-upgrade-of-ls

pushd $CLI_DIR
git checkout $BRANCH || git checkout -b $BRANCH

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-to-$LS_VERSION
git checkout -b $BRANCH

git config --global user.email "[email protected]"
git config --global user.name "Snyk Team IDE"
Expand All @@ -40,9 +41,17 @@ pushd $CLI_DIR
echo $PUB_SIGNING_KEY > signingkey.pub
git config --global user.signingkey ./signingkey.pub

git commit -am "feat: automatic integration of language server $LS_VERSION"
git push --set-upstream origin $BRANCH
git commit -am "feat: automatic integration of language server $LS_VERSION" || echo "No files to commit" && exit 0

git push -f --set-upstream origin $BRANCH

gh pr create --repo github.com/snyk/cli --base main --head $BRANCH --title "feat(language-server): integrate LS ($LS_VERSION)" --body "$BODY"
gh pr merge -m --auto
TITLE="feat(language-server): integrate LS"
PR=$(gh pr list --search "$TITLE" 2>&1 | grep -e "$TITLE" | cut -f1)
if [[ ! $PR ]]; then
echo "Creating new PR"
gh pr create --repo github.com/snyk/cli --base main --head $BRANCH --title "$TITLE" --body "$BODY"
else
gh pr edit $PR --repo github.com/snyk/cli --body "$BODY"
fi
gh pr merge -m --auto --delete-branch
popd
Loading