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

Jump to bottom

fix: revert breaking linter changes #555

Merged
merged 2 commits into from
Jun 20, 2024
Merged

fix: revert breaking linter changes #555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fba2ab
fix: revert breaking linter changes
bastiandoetsch Jun 20, 2024
bc72e38
fix: complete history in create-cli-pr.yaml
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
21 changes: 9 additions & 12 deletions .github/create-cli-pr.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions .github/workflows/create-cli-pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ jobs:

- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Determine Go version
run: |
Expand Down
Loading