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

fix: specify secrets correctly #550

Merged
merged 8 commits into from
Jun 19, 2024
Merged

fix: specify secrets correctly #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6940eea
fix: specify secrets correctly
bastiandoetsch Jun 19, 2024
1a93386
fix: create pr workflow steps
bastiandoetsch Jun 19, 2024
4c4c6e9
fix: use ssh for cloning cli repo
bastiandoetsch Jun 19, 2024
2d24a06
fix: use gh cli for cloning
bastiandoetsch Jun 19, 2024
910765a
fix: try to push using ssh
bastiandoetsch Jun 19, 2024
c6e0b80
fix: gh create command
bastiandoetsch Jun 19, 2024
96458de
fix: gh create command #2
bastiandoetsch Jun 19, 2024
6fc4e11
feat: add commit signing via ssh
bastiandoetsch Jun 19, 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
14 changes: 10 additions & 4 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,25 @@
set -ex

CLI_DIR=$(mktemp -d)
git clone --depth 1 https://github.com/snyk/cli $CLI_DIR
gh repo clone git@github.com:snyk/cli.git $CLI_DIR -- --depth=1
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-to-$LS_VERSION
BASE=$(git log --pretty=tformat:"%h" -n1 .)
git checkout -b $BRANCH

git config --global user.email "[email protected]"
git config --global user.name "Snyk Team IDE User"
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
git config --global user.signingkey ./signingkey.pub

git commit -am "feat: automatic integration of language server $LS_VERSION"
git push --set-upstream origin $BRANCH

COMMIT_HASH=$(git log --pretty=tformat:"%h" -n1 .)
gh pr create --repo github.com/snyk/cli --base main --fill-verbose --head $COMMIT_HASH --title "feat(language-server): integrate LS (automatic PR) ($LS_VERSION)" --body "$(echo $UPGRADE | sed 's/.*Message: \(.*\) URL.*$/\1/')"
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/')"
popd
8 changes: 7 additions & 1 deletion .github/workflows/create-cli-pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,14 @@ jobs:
with:
go-version: ${{ env.GO_VERSION }}

- uses: webfactory/[email protected]
with:
ssh-private-key: ${{ secrets.TEAM_IDE_USER_SSH }}

- name: Create PR in CLI to integrate LS
env:
GH_TOKEN: ${{ HAMMERHEAD_GITHUB_PAT_SNYKLS }}
GH_TOKEN: ${{ secrets.HAMMERHEAD_GITHUB_PAT_SNYKLS }}
GITHUB_TOKEN: ${{ secrets.HAMMERHEAD_GITHUB_PAT_SNYKLS }}
PUB_SIGNING_KEY: ${{ secrets.TEAM_IDE_USER_SSH_PUB }}
run: |
.github/create-cli-pr.sh
8 changes: 7 additions & 1 deletion .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,14 @@ jobs:
run: |
.github/upload-to-s3.sh

- uses: webfactory/[email protected]
with:
ssh-private-key: ${{ secrets.TEAM_IDE_USER_SSH }}

- name: Create PR in CLI to integrate LS
env:
GH_TOKEN: ${{ HAMMERHEAD_GITHUB_PAT_SNYKLS }}
GH_TOKEN: ${{ secrets.HAMMERHEAD_GITHUB_PAT_SNYKLS }}
GITHUB_TOKEN: ${{ secrets.HAMMERHEAD_GITHUB_PAT_SNYKLS }}
PUB_SIGNING_KEY: ${{ secrets.TEAM_IDE_USER_SSH_PUB }}
run: |
.github/create-cli-pr.sh
Loading