-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: revert breaking linter changes (#555)
- Loading branch information
1 parent
3c1006e
commit e588600
Showing
2 changed files
with
11 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,34 +18,31 @@ | |
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 -- --depth=1 | ||
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") | ||
|
||
pushd "$CLI_DIR" | ||
pushd $CLI_DIR | ||
UPGRADE=$(go run scripts/upgrade-snyk-go-dependencies.go --name=snyk-ls) | ||
NEW_LS_VERSION=$(echo "$UPGRADE" | sed 's/.*Sha: \(.*\) URL.*/\1/') | ||
BRANCH=feat/automatic-upgrade-of-ls-to-$NEW_LS_VERSION | ||
git checkout -b "$BRANCH" | ||
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" | ||
git config --global gpg.format ssh | ||
git config --global commit.gpgsign true | ||
|
||
echo "$PUB_SIGNING_KEY" > signingkey.pub | ||
echo $PUB_SIGNING_KEY > signingkey.pub | ||
git config --global user.signingkey ./signingkey.pub | ||
|
||
git commit -am "feat: automatic integration of language server $NEW_LS_VERSION" | ||
git push --set-upstream origin "$BRANCH" | ||
|
||
git commit -am "feat: automatic integration of language server $LS_VERSION" | ||
git push --set-upstream origin $BRANCH | ||
|
||
gh pr create --repo github.com/snyk/cli --base main --head "$BRANCH" --title "feat(language-server): integrate LS ($NEW_LS_VERSION)" --body "$BODY" | ||
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 | ||
popd |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters