diff --git a/lib/autobuild.js b/lib/autobuild.js index fec0b4ebfb..026a84ea4f 100644 --- a/lib/autobuild.js +++ b/lib/autobuild.js @@ -51,11 +51,11 @@ async function determineAutobuildLanguages(config, logger) { * For example, consider a user with the following workflow file: * * ```yml - * - uses: github/codeql-action/init@v2 + * - uses: github/codeql-action/init@v3 * with: * languages: go, java - * - uses: github/codeql-action/autobuild@v2 - * - uses: github/codeql-action/analyze@v2 + * - uses: github/codeql-action/autobuild@v3 + * - uses: github/codeql-action/analyze@v3 * ``` * * - With Go extraction disabled, we will run the Java autobuilder in the diff --git a/lib/codeql.js b/lib/codeql.js index 7d1183967e..ced8f71304 100644 --- a/lib/codeql.js +++ b/lib/codeql.js @@ -713,7 +713,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 " + - `${result.version}, you can replace 'github/codeql-action/*@v2' by ` + + `${result.version}, you can replace 'github/codeql-action/*@v3' by ` + `'github/codeql-action/*@v${(0, actions_util_1.getActionVersion)()}' in your code scanning workflow to ` + "continue using this version of the CodeQL Action."); core.exportVariable(environment_1.EnvVar.SUPPRESS_DEPRECATED_SOON_WARNING, "true"); diff --git a/lib/init-action-post-helper.test.js b/lib/init-action-post-helper.test.js index 20fa723f1b..3c713dd88e 100644 --- a/lib/init-action-post-helper.test.js +++ b/lib/init-action-post-helper.test.js @@ -92,14 +92,14 @@ const workflow = __importStar(require("./workflow")); }, { name: "Initialize CodeQL", - uses: "github/codeql-action/init@v2", + uses: "github/codeql-action/init@v3", with: { languages: "javascript", }, }, { name: "Perform CodeQL Analysis", - uses: "github/codeql-action/analyze@v2", + uses: "github/codeql-action/analyze@v3", with: { category: "my-category", }, @@ -115,14 +115,14 @@ const workflow = __importStar(require("./workflow")); }, { name: "Initialize CodeQL", - uses: "github/codeql-action/init@v2", + uses: "github/codeql-action/init@v3", with: { languages: "javascript", }, }, { name: "Perform CodeQL Analysis", - uses: "github/codeql-action/analyze@v2", + uses: "github/codeql-action/analyze@v3", with: { category: "my-category", }, @@ -141,14 +141,14 @@ const workflow = __importStar(require("./workflow")); }, { name: "Initialize CodeQL", - uses: "github/codeql-action/init@v2", + uses: "github/codeql-action/init@v3", with: { languages: "javascript", }, }, { name: "Perform CodeQL Analysis", - uses: "github/codeql-action/analyze@v2", + uses: "github/codeql-action/analyze@v3", with: { category: "my-category", }, @@ -194,14 +194,14 @@ for (const { uploadInput, shouldUpload } of UPLOAD_INPUT_TEST_CASES) { }, { name: "Initialize CodeQL", - uses: "github/codeql-action/init@v2", + uses: "github/codeql-action/init@v3", with: { languages: "javascript", }, }, { name: "Perform CodeQL Analysis", - uses: "github/codeql-action/analyze@v2", + uses: "github/codeql-action/analyze@v3", with: { category: "my-category", upload: uploadInput, @@ -225,14 +225,14 @@ for (const { uploadInput, shouldUpload } of UPLOAD_INPUT_TEST_CASES) { }, { name: "Initialize CodeQL", - uses: "github/codeql-action/init@v2", + uses: "github/codeql-action/init@v3", with: { languages: "javascript", }, }, { name: "Perform CodeQL Analysis", - uses: "github/codeql-action/analyze@v2", + uses: "github/codeql-action/analyze@v3", with: { category: "/language:${{ matrix.language }}", }, @@ -251,14 +251,14 @@ for (const { uploadInput, shouldUpload } of UPLOAD_INPUT_TEST_CASES) { }, { name: "Initialize CodeQL", - uses: "github/codeql-action/init@v2", + uses: "github/codeql-action/init@v3", with: { languages: "javascript", }, }, { name: "Perform CodeQL Analysis", - uses: "github/codeql-action/analyze@v2", + uses: "github/codeql-action/analyze@v3", with: { upload: "${{ matrix.language != 'csharp' }}", }, diff --git a/lib/workflow.test.js b/lib/workflow.test.js index ffd9115b17..6b5f6854af 100644 --- a/lib/workflow.test.js +++ b/lib/workflow.test.js @@ -214,9 +214,9 @@ async function testLanguageAliases(t, matrixLanguages, aliases, expectedErrorMes }, }, steps: [ - { uses: "actions/checkout@v2" }, - { uses: "github/codeql-action/init@v2" }, - { uses: "github/codeql-action/analyze@v2" }, + { uses: "actions/checkout@v3" }, + { uses: "github/codeql-action/init@v3" }, + { uses: "github/codeql-action/analyze@v3" }, ], }, }, @@ -306,11 +306,11 @@ async function testLanguageAliases(t, matrixLanguages, aliases, expectedErrorMes test: steps: - run: "git checkout HEAD^2" - + test2: steps: - run: "git checkout HEAD^2" - + test3: steps: [] `), await (0, codeql_1.getCodeQLForTesting)()); @@ -330,11 +330,11 @@ async function testLanguageAliases(t, matrixLanguages, aliases, expectedErrorMes test: steps: - run: "git checkout HEAD^2" - + test2: steps: - run: "git checkout HEAD^2" - + test3: steps: [] `), await (0, codeql_1.getCodeQLForTesting)()); @@ -380,9 +380,9 @@ async function testLanguageAliases(t, matrixLanguages, aliases, expectedErrorMes analysis: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: github/codeql-action/init@v2 - - uses: github/codeql-action/analyze@v2 + - uses: actions/checkout@v3 + - uses: github/codeql-action/init@v3 + - uses: github/codeql-action/analyze@v3 with: category: some-category `), "analysis", {}), "some-category"); @@ -394,9 +394,9 @@ async function testLanguageAliases(t, matrixLanguages, aliases, expectedErrorMes analysis: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: github/codeql-action/init@v2 - - uses: github/codeql-action/analyze@v2 + - uses: actions/checkout@v3 + - uses: github/codeql-action/init@v3 + - uses: github/codeql-action/analyze@v3 `), "analysis", {}), undefined); }); (0, ava_1.default)("getCategoryInputOrThrow returns category for workflow with multiple jobs", (t) => { @@ -406,19 +406,19 @@ async function testLanguageAliases(t, matrixLanguages, aliases, expectedErrorMes foo: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: github/codeql-action/init@v2 + - uses: actions/checkout@v3 + - uses: github/codeql-action/init@v3 - runs: ./build foo - - uses: github/codeql-action/analyze@v2 + - uses: github/codeql-action/analyze@v3 with: category: foo-category bar: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: github/codeql-action/init@v2 + - uses: actions/checkout@v3 + - uses: github/codeql-action/init@v3 - runs: ./build bar - - uses: github/codeql-action/analyze@v2 + - uses: github/codeql-action/analyze@v3 with: category: bar-category `), "bar", {}), "bar-category"); @@ -433,11 +433,11 @@ async function testLanguageAliases(t, matrixLanguages, aliases, expectedErrorMes matrix: language: [javascript, python] steps: - - uses: actions/checkout@v2 - - uses: github/codeql-action/init@v2 + - uses: actions/checkout@v3 + - uses: github/codeql-action/init@v3 with: language: \${{ matrix.language }} - - uses: github/codeql-action/analyze@v2 + - uses: github/codeql-action/analyze@v3 with: category: "/language:\${{ matrix.language }}" `), "analysis", { language: "javascript" }), "/language:javascript"); @@ -448,9 +448,9 @@ async function testLanguageAliases(t, matrixLanguages, aliases, expectedErrorMes jobs: analysis: steps: - - uses: actions/checkout@v2 - - uses: github/codeql-action/init@v2 - - uses: github/codeql-action/analyze@v2 + - uses: actions/checkout@v3 + - uses: github/codeql-action/init@v3 + - uses: github/codeql-action/analyze@v3 with: category: "\${{ github.workflow }}" `), "analysis", {}), { @@ -465,12 +465,12 @@ async function testLanguageAliases(t, matrixLanguages, aliases, expectedErrorMes analysis: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: github/codeql-action/init@v2 - - uses: github/codeql-action/analyze@v2 + - uses: actions/checkout@v3 + - uses: github/codeql-action/init@v3 + - uses: github/codeql-action/analyze@v3 with: category: some-category - - uses: github/codeql-action/analyze@v2 + - uses: github/codeql-action/analyze@v3 with: category: another-category `), "analysis", {}), {