Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/auto-merge-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
github-token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
2 changes: 1 addition & 1 deletion checkmarx-ast-cli.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.3.46
2.3.48
2 changes: 1 addition & 1 deletion src/main/osinstaller/CxInstaller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<SupportedPlatforms, PlatformData> = {
Expand Down
Loading