From 9437983d34cb2c516bc4121759ae38a9691f7370 Mon Sep 17 00:00:00 2001 From: cx-bot-ghpublic <271284991+cx-bot-ghpublic@users.noreply.github.com> Date: Thu, 2 Apr 2026 06:54:26 +0000 Subject: [PATCH 1/2] Update checkmarx-ast-cli to 2.3.48 --- checkmarx-ast-cli.version | 2 +- src/main/osinstaller/CxInstaller.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checkmarx-ast-cli.version b/checkmarx-ast-cli.version index 1f18232f..aadd7fdc 100644 --- a/checkmarx-ast-cli.version +++ b/checkmarx-ast-cli.version @@ -1 +1 @@ -2.3.46 +2.3.48 diff --git a/src/main/osinstaller/CxInstaller.ts b/src/main/osinstaller/CxInstaller.ts index a85f22db..d01fa3c7 100644 --- a/src/main/osinstaller/CxInstaller.ts +++ b/src/main/osinstaller/CxInstaller.ts @@ -22,7 +22,7 @@ export class CxInstaller { private cliVersion: string; private readonly resourceDirPath: string; private readonly installedCLIVersionFileName = 'cli-version'; - private readonly cliDefaultVersion = '2.3.46'; // Update this with the latest version. + private readonly cliDefaultVersion = '2.3.48'; // Update this with the latest version. private readonly client: AstClient; private static readonly PLATFORMS: Record = { From 8cf045dc9c556f10dd72f676262b54ad5fa61248 Mon Sep 17 00:00:00 2001 From: Anurag Dalke Date: Tue, 7 Apr 2026 17:50:16 +0530 Subject: [PATCH 2/2] Change Dependabot PR merge strategy to squash --- .github/workflows/auto-merge-pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/auto-merge-pr.yml b/.github/workflows/auto-merge-pr.yml index 44d8ff6d..9b126e94 100644 --- a/.github/workflows/auto-merge-pr.yml +++ b/.github/workflows/auto-merge-pr.yml @@ -13,8 +13,8 @@ jobs: env: PR_URL: ${{github.event.pull_request.html_url}} GITHUB_TOKEN: ${{secrets.PERSONAL_ACCESS_TOKEN }} - run: gh pr merge --auto --merge "$PR_URL" + run: gh pr merge --auto --squash "$PR_URL" - name: Auto approve dependabot PRs uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363 #v4 with: - github-token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} \ No newline at end of file + github-token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}