From 2a96432c7965516d362a9e05f362d6e445ef240b Mon Sep 17 00:00:00 2001 From: Chuan-kai Lin Date: Fri, 5 Apr 2024 08:47:14 -0700 Subject: [PATCH] Resolve conflicts in codeql.ts --- lib/codeql.js | 5 ----- src/codeql.ts | 5 ----- 2 files changed, 10 deletions(-) diff --git a/lib/codeql.js b/lib/codeql.js index b6f3cf40b..518fc2e7c 100644 --- a/lib/codeql.js +++ b/lib/codeql.js @@ -699,12 +699,7 @@ async function getCodeQLForCmd(cmd, checkVersion) { "version of the CLI using the 'tools' input to the 'init' Action, you can remove this " + "input to use the default version.\n\n" + "Alternatively, if you want to continue using CodeQL CLI version " + -<<<<<<< HEAD - `${result.version}, you can replace 'github/codeql-action/*@v2' by ` + - `'github/codeql-action/*@v${(0, actions_util_1.getActionVersion)()}' in your code scanning workflow to ` + -======= `${result.version}, you can replace 'github/codeql-action/*@v${(0, actions_util_1.getActionVersion)().split(".")[0]}' by 'github/codeql-action/*@v${(0, actions_util_1.getActionVersion)()}' in your code scanning workflow to ` + ->>>>>>> origin/releases/v3 "continue using this version of the CodeQL Action."); core.exportVariable(environment_1.EnvVar.SUPPRESS_DEPRECATED_SOON_WARNING, "true"); } diff --git a/src/codeql.ts b/src/codeql.ts index 71e2d432e..927b64d3d 100644 --- a/src/codeql.ts +++ b/src/codeql.ts @@ -1144,14 +1144,9 @@ export async function getCodeQLForCmd( "version of the CLI using the 'tools' input to the 'init' Action, you can remove this " + "input to use the default version.\n\n" + "Alternatively, if you want to continue using CodeQL CLI version " + -<<<<<<< HEAD - `${result.version}, you can replace 'github/codeql-action/*@v2' by ` + - `'github/codeql-action/*@v${getActionVersion()}' in your code scanning workflow to ` + -======= `${result.version}, you can replace 'github/codeql-action/*@v${ getActionVersion().split(".")[0] }' by 'github/codeql-action/*@v${getActionVersion()}' in your code scanning workflow to ` + ->>>>>>> origin/releases/v3 "continue using this version of the CodeQL Action.", ); core.exportVariable(EnvVar.SUPPRESS_DEPRECATED_SOON_WARNING, "true");