From 62b09d11c146c4d13f21f5212020ff6b6ba5d43e Mon Sep 17 00:00:00 2001 From: Austin Theriault Date: Wed, 4 Sep 2024 13:52:02 -0700 Subject: [PATCH 1/4] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b2816b8..f41ad3d 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "semgrep", "displayName": "Semgrep", "description": "Security scans in a snap. Speedy SAST with a powerful rule registry for seamless detection and remediation of code vulnerabilities with each save.", - "version": "1.9.0", + "version": "1.9.1", "engines": { "vscode": "^1.86.0" }, From ed67c44689f3a2c35a0b44a325a9950891004670 Mon Sep 17 00:00:00 2001 From: ajbt200128 Date: Wed, 4 Sep 2024 14:06:49 -0700 Subject: [PATCH 2/4] fix download action --- download-osemgrep-pro.sh | 3 ++- osemgrep-pro-version | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 osemgrep-pro-version diff --git a/download-osemgrep-pro.sh b/download-osemgrep-pro.sh index dd89957..1466be5 100755 --- a/download-osemgrep-pro.sh +++ b/download-osemgrep-pro.sh @@ -9,7 +9,8 @@ case "${uname}" in *) machine=manylinux;; esac # NOT the same as the semgrep version!!!! -OSEMGREP_PRO_VERSION=$(cat ./osemgrep-pro-version) +release_char_count=$(echo "release-" | wc -c) +OSEMGREP_PRO_VERSION=$(cat ./semgrep-version | cut -c $((release_char_count))-) BINARY=semgrep-core-proprietary-${machine}-${OSEMGREP_PRO_VERSION} # Check if osemgrep-pro exists and if its a symlink then exit if [ -L dist/osemgrep-pro ]; then diff --git a/osemgrep-pro-version b/osemgrep-pro-version deleted file mode 100644 index 22e1f1f..0000000 --- a/osemgrep-pro-version +++ /dev/null @@ -1 +0,0 @@ -0.149.0 From 8e526fa091fb405cdaadb241fd1bb99286a001c3 Mon Sep 17 00:00:00 2001 From: ajbt200128 Date: Wed, 4 Sep 2024 14:19:47 -0700 Subject: [PATCH 3/4] auto bump version on semgrep version bump --- .github/workflows/bump_version.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/bump_version.yml b/.github/workflows/bump_version.yml index 36c56ba..1332ae6 100644 --- a/.github/workflows/bump_version.yml +++ b/.github/workflows/bump_version.yml @@ -26,6 +26,10 @@ jobs: exit 1 fi echo "${SEMGREP_STATIC_VERSION}" > semgrep-version + - uses: actions/setup-node@v4.0.3 + with: + node-version: lts/* + - run: npm ci - name: Commit and push id: commit env: @@ -39,6 +43,7 @@ jobs: BRANCH="gha/bump-version-${NEW_SEMGREP_VERSION}-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}" SUBJECT="Bump semgrep to ${NEW_SEMGREP_VERSION}" git checkout -b "${BRANCH}" + npm version patch git add . git commit -m "${SUBJECT}" git push --set-upstream origin "${BRANCH}" From da6f755a86cdc84e9f06a8f8c96828fb2c6c2987 Mon Sep 17 00:00:00 2001 From: ajbt200128 Date: Wed, 4 Sep 2024 14:23:41 -0700 Subject: [PATCH 4/4] bump checkout version --- .github/workflows/bump_version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bump_version.yml b/.github/workflows/bump_version.yml index 1332ae6..189465b 100644 --- a/.github/workflows/bump_version.yml +++ b/.github/workflows/bump_version.yml @@ -16,7 +16,7 @@ jobs: contents: write pull-requests: write steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Update version env: SEMGREP_STATIC_VERSION: "release-${{ inputs.version }}"