Merge pull request #1491 from github/update-v1.1.39-a34ca99b

Merge releases/v2 into releases/v1
2023-01-18 19:25:27 +00:00 · 2023-01-18 19:25:27 +00:00 · 231aa2c8a8
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,13 @@
 # CodeQL Action Changelog

+## 1.1.39 - 18 Jan 2023
+
+- CodeQL Action v1 is now deprecated, and is no longer updated or supported. For better performance, improved security, and new features, upgrade to v2. For more information, see [this changelog post](https://github.blog/changelog/2023-01-18-code-scanning-codeql-action-v1-is-now-deprecated/). [#1467](https://github.com/github/codeql-action/pull/1466)
+- Python automatic dependency installation will no longer fail for projects using Poetry that specify `virtualenvs.options.no-pip = true` in their `poetry.toml`. [#1431](https://github.com/github/codeql-action/pull/1431)
+- Avoid printing a stack trace and error message when the action fails to find the SHA at the
+  current directory. This will happen in several non-error states and so we now avoid cluttering the
+  log with this message. [#1485](https://github.com/github/codeql-action/pull/1485)
+
 ## 1.1.38 - 12 Jan 2023

 - Update default CodeQL bundle version to 2.12.0. [#1466](https://github.com/github/codeql-action/pull/1466)
@ -12,7 +20,7 @@

 - Update default CodeQL bundle version to 2.11.5. [#1412](https://github.com/github/codeql-action/pull/1412)
 - Add a step that tries to upload a SARIF file for the workflow run when that workflow run fails. This will help better surface failed code scanning workflow runs. [#1393](https://github.com/github/codeql-action/pull/1393)
- Python automatic dependency installation will no longer consider dependecy code installed in venv as user-written, for projects using Poetry that specify `virtualenvs.in-project = true` in their `poetry.toml`. [#1419](https://github.com/github/codeql-action/pull/1419).
+- Python automatic dependency installation will no longer consider dependency code installed in venv as user-written, for projects using Poetry that specify `virtualenvs.in-project = true` in their `poetry.toml`. [#1419](https://github.com/github/codeql-action/pull/1419)

 ## 1.1.35 - 01 Dec 2022

@ -61,7 +69,7 @@ No user facing changes.
 ## 1.1.25 - 21 Sep 2022

 - We will soon be rolling out a feature of the CodeQL Action that stores some information used to make future runs faster in the GitHub Actions cache. Initially, this will only be enabled on JavaScript repositories, but we plan to add more languages to this soon. The new feature can be disabled by passing the `trap-caching: false` option to your workflow's `init` step, for example if you are already using the GitHub Actions cache for a different purpose and are near the storage limit for it.
- Add support for Python automatic dependency installation with Poetry 1.2 [#1258](https://github.com/github/codeql-action/pull/1258).
+- Add support for Python automatic dependency installation with Poetry 1.2 [#1258](https://github.com/github/codeql-action/pull/1258)

 ## 1.1.24 - 16 Sep 2022

@ -312,7 +320,7 @@ No user facing changes.
 ## 1.0.4 - 28 Jun 2021

 - Fix `RUNNER_TEMP environment variable must be set` when using runner. [#594](https://github.com/github/codeql-action/pull/594)
- Fix couting of lines of code for C# projects. [#586](https://github.com/github/codeql-action/pull/586)
+- Fix counting of lines of code for C# projects. [#586](https://github.com/github/codeql-action/pull/586)

 ## 1.0.3 - 23 Jun 2021

--- a/lib/actions-util.js
+++ b/lib/actions-util.js
@ -88,8 +88,9 @@ const getCommitOid = async function (checkoutPath, ref = "HEAD") {
        return commitOid.trim();
    }
    catch (e) {
-        core.info(`Failed to call git to get current commit. Continuing with data from environment or input: ${e}`);
-        core.info(e.stack || "NO STACK");
+        core.info("Could not determine current commit SHA using git. Continuing with data from user input or environment.");
+        core.debug(`Reason: ${e.message}`);
+        core.debug(e.stack || "NO STACK");
        return (0, exports.getOptionalInput)("sha") || (0, util_1.getRequiredEnvParam)("GITHUB_SHA");
    }
 };
--- a/lib/actions-util.js.map
+++ b/lib/actions-util.js.map
--- a/lib/analyze.js
+++ b/lib/analyze.js
@ -50,6 +50,7 @@ async function setupPythonExtractor(logger) {
        // If CODEQL_PYTHON is not set, no dependencies were installed, so we don't need to do anything
        return;
    }
+    const scriptsFolder = path.resolve(__dirname, "../python-setup");
    let output = "";
    const options = {
        listeners: {
@ -58,10 +59,7 @@ async function setupPythonExtractor(logger) {
            },
        },
    };
-    await new toolrunner.ToolRunner(codeqlPython, [
-        "-c",
-        "import os; import pip; print(os.path.dirname(os.path.dirname(pip.__file__)))",
-    ], options).exec();
+    await new toolrunner.ToolRunner(codeqlPython, [path.join(scriptsFolder, "find_site_packages.py")], options).exec();
    logger.info(`Setting LGTM_INDEX_IMPORT_PATH=${output}`);
    process.env["LGTM_INDEX_IMPORT_PATH"] = output;
    output = "";
@ -129,12 +127,6 @@ async function runQueries(sarifFolder, memoryFlag, addSnippetsFlag, threadsFlag,
        const queries = config.queries[language];
        const queryFilters = validateQueryFilters(config.originalUserInput["query-filters"]);
        const packsWithVersion = config.packs[language] || [];
-        const hasBuiltinQueries = (queries === null || queries === void 0 ? void 0 : queries.builtin.length) > 0;
-        const hasCustomQueries = (queries === null || queries === void 0 ? void 0 : queries.custom.length) > 0;
-        const hasPackWithCustomQueries = packsWithVersion.length > 0;
-        if (!hasBuiltinQueries && !hasCustomQueries && !hasPackWithCustomQueries) {
-            throw new Error(`Unable to analyze ${language} as no queries were selected for this language`);
-        }
        try {
            if (await util.useCodeScanningConfigInCli(codeql, featureEnablement)) {
                // If we are using the code scanning config in the CLI,
@ -160,6 +152,14 @@ async function runQueries(sarifFolder, memoryFlag, addSnippetsFlag, threadsFlag,
            }
            else {
                // config was generated by the action, so must be interpreted by the action.
+                const hasBuiltinQueries = (queries === null || queries === void 0 ? void 0 : queries.builtin.length) > 0;
+                const hasCustomQueries = (queries === null || queries === void 0 ? void 0 : queries.custom.length) > 0;
+                const hasPackWithCustomQueries = packsWithVersion.length > 0;
+                if (!hasBuiltinQueries &&
+                    !hasCustomQueries &&
+                    !hasPackWithCustomQueries) {
+                    throw new Error(`Unable to analyze ${language} as no queries were selected for this language`);
+                }
                logger.startGroup(`Running queries for ${language}`);
                const querySuitePaths = [];
                if (queries["builtin"].length > 0) {
--- a/lib/analyze.js.map
+++ b/lib/analyze.js.map
--- a/lib/api-compatibility.json
+++ b/lib/api-compatibility.json
@ -1 +1 @@
-{ "maximumVersion": "3.8", "minimumVersion": "3.3" }
+{ "maximumVersion": "3.8", "minimumVersion": "3.4" }
--- a/lib/codeql.js
+++ b/lib/codeql.js
@ -518,7 +518,7 @@ async function getCodeQLForCmd(cmd, checkVersion) {
                ...getExtraOptionsFromEnv(["database", "init"]),
            ]);
        },
-        async databaseInitCluster(config, sourceRoot, processName, featureEnablement) {
+        async databaseInitCluster(config, sourceRoot, processName, featureEnablement, logger) {
            const extraArgs = config.languages.map((language) => `--language=${language}`);
            if (config.languages.filter((l) => (0, languages_1.isTracedLanguage)(l)).length > 0) {
                extraArgs.push("--begin-tracing");
@ -537,7 +537,7 @@ async function getCodeQLForCmd(cmd, checkVersion) {
                }
            }
            // A config file is only generated if the CliConfigFileEnabled feature flag is enabled.
-            const configLocation = await generateCodeScanningConfig(codeql, config, featureEnablement);
+            const configLocation = await generateCodeScanningConfig(codeql, config, featureEnablement, logger);
            // Only pass external repository token if a config file is going to be parsed by the CLI.
            let externalRepositoryToken;
            if (configLocation) {
@ -923,7 +923,7 @@ async function runTool(cmd, args = [], opts = {}) {
 * @param config The configuration to use.
 * @returns the path to the generated user configuration file.
 */
-async function generateCodeScanningConfig(codeql, config, featureEnablement) {
+async function generateCodeScanningConfig(codeql, config, featureEnablement, logger) {
    var _a;
    if (!(await util.useCodeScanningConfigInCli(codeql, featureEnablement))) {
        return;
@ -982,6 +982,10 @@ async function generateCodeScanningConfig(codeql, config, featureEnablement) {
            augmentedConfig.packs["javascript"].push(packString);
        }
    }
+    logger.info(`Writing augmented user configuration file to ${configLocation}`);
+    logger.startGroup("Augmented user configuration file contents");
+    logger.info(yaml.dump(augmentedConfig));
+    logger.endGroup();
    fs.writeFileSync(configLocation, yaml.dump(augmentedConfig));
    return configLocation;
 }
--- a/lib/codeql.js.map
+++ b/lib/codeql.js.map
--- a/lib/util.js
+++ b/lib/util.js
@ -31,7 +31,6 @@ const core = __importStar(require("@actions/core"));
 const del_1 = __importDefault(require("del"));
 const get_folder_size_1 = __importDefault(require("get-folder-size"));
 const semver = __importStar(require("semver"));
-const api = __importStar(require("./api-client"));
 const api_client_1 = require("./api-client");
 const apiCompatibility = __importStar(require("./api-compatibility.json"));
 const codeql_1 = require("./codeql");
@ -530,26 +529,15 @@ exports.getMlPoweredJsQueriesStatus = getMlPoweredJsQueriesStatus;
 * Prompt the customer to upgrade to CodeQL Action v2, if appropriate.
 *
 * Check whether a customer is running v1. If they are, and we can determine that the GitHub
- * instance supports v2, then log a warning about v1's upcoming deprecation prompting the customer
- * to upgrade to v2.
+ * instance supports v2, then log an error that v1 is deprecated and prompt the customer to
+ * upgrade to v2.
 */
 async function checkActionVersion(version) {
-    var _a;
    if (!semver.satisfies(version, ">=2")) {
-        const githubVersion = await api.getGitHubVersion();
-        // Only log a warning for versions of GHES that are compatible with CodeQL Action version 2.
-        //
-        // GHES 3.4 shipped without the v2 tag, but it also shipped without this warning message code.
-        // Therefore users who are seeing this warning message code have pulled in a new version of the
-        // Action, and with it the v2 tag.
-        if (githubVersion.type === GitHubVariant.DOTCOM ||
-            githubVersion.type === GitHubVariant.GHAE ||
-            (githubVersion.type === GitHubVariant.GHES &&
-                semver.satisfies((_a = semver.coerce(githubVersion.version)) !== null && _a !== void 0 ? _a : "0.0.0", ">=3.4"))) {
-            core.warning("CodeQL Action v1 will be deprecated on January 18th, 2023. Please upgrade to v2. For " +
-                "more information, see " +
-                "https://github.blog/changelog/2022-04-27-code-scanning-deprecation-of-codeql-action-v1/");
-        }
+        core.error("This version of the CodeQL Action was deprecated on January 18th, 2023, and is no longer " +
+            "updated or supported. For better performance, improved security, and new features, " +
+            "upgrade to v2. For more information, see " +
+            "https://github.blog/changelog/2023-01-18-code-scanning-codeql-action-v1-is-now-deprecated/");
    }
 }
 exports.checkActionVersion = checkActionVersion;
--- a/lib/util.js.map
+++ b/lib/util.js.map
--- a/lib/util.test.js
+++ b/lib/util.test.js
@ -259,7 +259,7 @@ function formatGitHubVersion(version) {
 const CHECK_ACTION_VERSION_TESTS = [
    ["1.2.1", { type: util.GitHubVariant.DOTCOM }, true],
    ["1.2.1", { type: util.GitHubVariant.GHAE }, true],
-    ["1.2.1", { type: util.GitHubVariant.GHES, version: "3.3" }, false],
+    ["1.2.1", { type: util.GitHubVariant.GHES, version: "3.3" }, true],
    ["1.2.1", { type: util.GitHubVariant.GHES, version: "3.4" }, true],
    ["1.2.1", { type: util.GitHubVariant.GHES, version: "3.5" }, true],
    ["2.2.1", { type: util.GitHubVariant.DOTCOM }, false],
@ -268,22 +268,22 @@ const CHECK_ACTION_VERSION_TESTS = [
    ["2.2.1", { type: util.GitHubVariant.GHES, version: "3.4" }, false],
    ["2.2.1", { type: util.GitHubVariant.GHES, version: "3.5" }, false],
 ];
-for (const [version, githubVersion, shouldReportWarning,] of CHECK_ACTION_VERSION_TESTS) {
-    const reportWarningDescription = shouldReportWarning
-        ? "reports warning"
-        : "doesn't report warning";
+for (const [version, githubVersion, shouldReportError,] of CHECK_ACTION_VERSION_TESTS) {
+    const reportErrorDescription = shouldReportError
+        ? "reports error"
+        : "doesn't report error";
    const versionsDescription = `CodeQL Action version ${version} and GitHub version ${formatGitHubVersion(githubVersion)}`;
-    (0, ava_1.default)(`checkActionVersion ${reportWarningDescription} for ${versionsDescription}`, async (t) => {
-        const warningSpy = sinon.spy(core, "warning");
+    (0, ava_1.default)(`checkActionVersion ${reportErrorDescription} for ${versionsDescription}`, async (t) => {
+        const errorSpy = sinon.spy(core, "error");
        const versionStub = sinon
            .stub(api, "getGitHubVersion")
            .resolves(githubVersion);
        await util.checkActionVersion(version);
-        if (shouldReportWarning) {
-            t.true(warningSpy.calledOnceWithExactly(sinon.match("CodeQL Action v1 will be deprecated")));
+        if (shouldReportError) {
+            t.true(errorSpy.calledOnceWithExactly(sinon.match("This version of the CodeQL Action was deprecated on January 18th, 2023")));
        }
        else {
-            t.false(warningSpy.called);
+            t.false(errorSpy.called);
        }
        versionStub.restore();
    });
--- a/lib/util.test.js.map
+++ b/lib/util.test.js.map
--- a/node_modules/.package-lock.json
+++ b/node_modules/.package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "codeql",
-  "version": "1.1.38",
+  "version": "1.1.39",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
--- a/package-lock.json
+++ b/package-lock.json
@ -1,12 +1,12 @@
 {
  "name": "codeql",
-  "version": "1.1.38",
+  "version": "1.1.39",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "codeql",
-      "version": "1.1.38",
+      "version": "1.1.39",
      "license": "MIT",
      "dependencies": {
        "@actions/artifact": "^1.1.0",
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "codeql",
-  "version": "1.1.38",
+  "version": "1.1.39",
  "private": true,
  "description": "CodeQL action",
  "scripts": {
--- a/python-setup/find_site_packages.py
+++ b/python-setup/find_site_packages.py
@ -0,0 +1,34 @@
+"""
+Print the path to the site-packages directory for the current Python environment.
+"""
+from __future__ import print_function
+
+try:
+    import pip
+    import os
+    print(os.path.dirname(os.path.dirname(pip.__file__)))
+except ImportError:
+    import sys
+    print("DEBUG: could not import pip", file=sys.stderr)
+    # if you use poetry with `virtualenvs.options.no-pip = true` you might end up with a
+    # virtualenv without pip, so the above trick doesn't actually work. See
+    # https://python-poetry.org/docs/configuration/#virtualenvsoptionsno-pip
+    #
+    # A possible option is to install `pip` into the virtualenv created by poetry
+    # (`poetry add pip`), but it turns out that doesn't always work :( for the test
+    # poetry/requests-3, I was not allowed to install pip! So I did not pursue this
+    # option further.
+    #
+    # Instead, testing `site.getsitepackages()` contains has the right path, whereas
+    # `site.getusersitepackages()` is about the system python (very confusing).
+    #
+    # We can't use the environment variable POETRY_VIRTUALENVS_OPTIONS_NO_PIP because it
+    # does not work, see https://github.com/python-poetry/poetry/issues/5906
+    import site
+
+    if sys.platform.startswith("win32"):
+        # On windows, the last entry of `site.getsitepackages()` has the right path
+        print(site.getsitepackages()[-1])
+    else:
+        # on unix, the first entry of `site.getsitepackages()` has the right path
+        print(site.getsitepackages()[0])
--- a/python-setup/tests/from_python_exe.py
+++ b/python-setup/tests/from_python_exe.py
@ -9,8 +9,7 @@ def get_details(path_to_python_exe: str) -> Tuple[str, str]:
    import_path = subprocess.check_output(
        [
            path_to_python_exe,
-            "-c",
-            "import os; import pip; print(os.path.dirname(os.path.dirname(pip.__file__)))",
+            os.path.join(os.path.dirname(__file__), "..", "find_site_packages.py")
        ],
        stdin=subprocess.DEVNULL,
    )
--- a/python-setup/tests/poetry/requests-3/poetry.toml
+++ b/python-setup/tests/poetry/requests-3/poetry.toml
@ -1,2 +1,5 @@
 [virtualenvs]
 in-project = true
+
+[virtualenvs.options]
+no-pip = true
--- a/src/actions-util.ts
+++ b/src/actions-util.ts
@ -88,9 +88,10 @@ export const getCommitOid = async function (
    return commitOid.trim();
  } catch (e) {
    core.info(
-      `Failed to call git to get current commit. Continuing with data from environment or input: ${e}`
+      "Could not determine current commit SHA using git. Continuing with data from user input or environment."
    );
-    core.info((e as Error).stack || "NO STACK");
+    core.debug(`Reason: ${(e as Error).message}`);
+    core.debug((e as Error).stack || "NO STACK");
    return getOptionalInput("sha") || getRequiredEnvParam("GITHUB_SHA");
  }
 };
--- a/src/analyze.ts
+++ b/src/analyze.ts
@ -88,6 +88,8 @@ async function setupPythonExtractor(logger: Logger) {
    return;
  }

+  const scriptsFolder = path.resolve(__dirname, "../python-setup");
+
  let output = "";
  const options = {
    listeners: {
@ -99,10 +101,7 @@ async function setupPythonExtractor(logger: Logger) {

  await new toolrunner.ToolRunner(
    codeqlPython,
-    [
-      "-c",
-      "import os; import pip; print(os.path.dirname(os.path.dirname(pip.__file__)))",
-    ],
+    [path.join(scriptsFolder, "find_site_packages.py")],
    options
  ).exec();
  logger.info(`Setting LGTM_INDEX_IMPORT_PATH=${output}`);
@ -223,16 +222,6 @@ export async function runQueries(
    );
    const packsWithVersion = config.packs[language] || [];

-    const hasBuiltinQueries = queries?.builtin.length > 0;
-    const hasCustomQueries = queries?.custom.length > 0;
-    const hasPackWithCustomQueries = packsWithVersion.length > 0;
-
-    if (!hasBuiltinQueries && !hasCustomQueries && !hasPackWithCustomQueries) {
-      throw new Error(
-        `Unable to analyze ${language} as no queries were selected for this language`
-      );
-    }
-
    try {
      if (await util.useCodeScanningConfigInCli(codeql, featureEnablement)) {
        // If we are using the code scanning config in the CLI,
@ -263,6 +252,21 @@ export async function runQueries(
        logger.info(analysisSummary);
      } else {
        // config was generated by the action, so must be interpreted by the action.
+
+        const hasBuiltinQueries = queries?.builtin.length > 0;
+        const hasCustomQueries = queries?.custom.length > 0;
+        const hasPackWithCustomQueries = packsWithVersion.length > 0;
+
+        if (
+          !hasBuiltinQueries &&
+          !hasCustomQueries &&
+          !hasPackWithCustomQueries
+        ) {
+          throw new Error(
+            `Unable to analyze ${language} as no queries were selected for this language`
+          );
+        }
+
        logger.startGroup(`Running queries for ${language}`);
        const querySuitePaths: string[] = [];
        if (queries["builtin"].length > 0) {
--- a/src/api-compatibility.json
+++ b/src/api-compatibility.json
@ -1 +1 @@
-{"maximumVersion": "3.8", "minimumVersion": "3.3"}
+{"maximumVersion": "3.8", "minimumVersion": "3.4"}
--- a/src/codeql.ts
+++ b/src/codeql.ts
@ -855,7 +855,8 @@ async function getCodeQLForCmd(
      config: Config,
      sourceRoot: string,
      processName: string | undefined,
-      featureEnablement: FeatureEnablement
+      featureEnablement: FeatureEnablement,
+      logger: Logger
    ) {
      const extraArgs = config.languages.map(
        (language) => `--language=${language}`
@ -888,7 +889,8 @@ async function getCodeQLForCmd(
      const configLocation = await generateCodeScanningConfig(
        codeql,
        config,
-        featureEnablement
+        featureEnablement,
+        logger
      );
      // Only pass external repository token if a config file is going to be parsed by the CLI.
      let externalRepositoryToken: string | undefined;
@ -1386,7 +1388,8 @@ async function runTool(
 async function generateCodeScanningConfig(
  codeql: CodeQL,
  config: Config,
-  featureEnablement: FeatureEnablement
+  featureEnablement: FeatureEnablement,
+  logger: Logger
 ): Promise<string | undefined> {
  if (!(await util.useCodeScanningConfigInCli(codeql, featureEnablement))) {
    return;
@ -1448,6 +1451,10 @@ async function generateCodeScanningConfig(
      augmentedConfig.packs["javascript"].push(packString);
    }
  }
+  logger.info(`Writing augmented user configuration file to ${configLocation}`);
+  logger.startGroup("Augmented user configuration file contents");
+  logger.info(yaml.dump(augmentedConfig));
+  logger.endGroup();

  fs.writeFileSync(configLocation, yaml.dump(augmentedConfig));
  return configLocation;
--- a/src/util.test.ts
+++ b/src/util.test.ts
@ -328,7 +328,7 @@ const CHECK_ACTION_VERSION_TESTS: Array<[string, util.GitHubVersion, boolean]> =
  [
    ["1.2.1", { type: util.GitHubVariant.DOTCOM }, true],
    ["1.2.1", { type: util.GitHubVariant.GHAE }, true],
-    ["1.2.1", { type: util.GitHubVariant.GHES, version: "3.3" }, false],
+    ["1.2.1", { type: util.GitHubVariant.GHES, version: "3.3" }, true],
    ["1.2.1", { type: util.GitHubVariant.GHES, version: "3.4" }, true],
    ["1.2.1", { type: util.GitHubVariant.GHES, version: "3.5" }, true],
    ["2.2.1", { type: util.GitHubVariant.DOTCOM }, false],
@ -341,28 +341,30 @@ const CHECK_ACTION_VERSION_TESTS: Array<[string, util.GitHubVersion, boolean]> =
 for (const [
  version,
  githubVersion,
-  shouldReportWarning,
+  shouldReportError,
 ] of CHECK_ACTION_VERSION_TESTS) {
-  const reportWarningDescription = shouldReportWarning
-    ? "reports warning"
-    : "doesn't report warning";
+  const reportErrorDescription = shouldReportError
+    ? "reports error"
+    : "doesn't report error";
  const versionsDescription = `CodeQL Action version ${version} and GitHub version ${formatGitHubVersion(
    githubVersion
  )}`;
-  test(`checkActionVersion ${reportWarningDescription} for ${versionsDescription}`, async (t) => {
-    const warningSpy = sinon.spy(core, "warning");
+  test(`checkActionVersion ${reportErrorDescription} for ${versionsDescription}`, async (t) => {
+    const errorSpy = sinon.spy(core, "error");
    const versionStub = sinon
      .stub(api, "getGitHubVersion")
      .resolves(githubVersion);
    await util.checkActionVersion(version);
-    if (shouldReportWarning) {
+    if (shouldReportError) {
      t.true(
-        warningSpy.calledOnceWithExactly(
-          sinon.match("CodeQL Action v1 will be deprecated")
+        errorSpy.calledOnceWithExactly(
+          sinon.match(
+            "This version of the CodeQL Action was deprecated on January 18th, 2023"
+          )
        )
      );
    } else {
-      t.false(warningSpy.called);
+      t.false(errorSpy.called);
    }
    versionStub.restore();
  });
--- a/src/util.ts
+++ b/src/util.ts
@ -8,7 +8,6 @@ import del from "del";
 import getFolderSize from "get-folder-size";
 import * as semver from "semver";

-import * as api from "./api-client";
 import { getApiClient, GitHubApiDetails } from "./api-client";
 import * as apiCompatibility from "./api-compatibility.json";
 import { CodeQL, CODEQL_VERSION_NEW_TRACING } from "./codeql";
@ -633,32 +632,17 @@ export function getMlPoweredJsQueriesStatus(config: Config): string {
 * Prompt the customer to upgrade to CodeQL Action v2, if appropriate.
 *
 * Check whether a customer is running v1. If they are, and we can determine that the GitHub
- * instance supports v2, then log a warning about v1's upcoming deprecation prompting the customer
- * to upgrade to v2.
+ * instance supports v2, then log an error that v1 is deprecated and prompt the customer to
+ * upgrade to v2.
 */
 export async function checkActionVersion(version: string) {
  if (!semver.satisfies(version, ">=2")) {
-    const githubVersion = await api.getGitHubVersion();
-    // Only log a warning for versions of GHES that are compatible with CodeQL Action version 2.
-    //
-    // GHES 3.4 shipped without the v2 tag, but it also shipped without this warning message code.
-    // Therefore users who are seeing this warning message code have pulled in a new version of the
-    // Action, and with it the v2 tag.
-    if (
-      githubVersion.type === GitHubVariant.DOTCOM ||
-      githubVersion.type === GitHubVariant.GHAE ||
-      (githubVersion.type === GitHubVariant.GHES &&
-        semver.satisfies(
-          semver.coerce(githubVersion.version) ?? "0.0.0",
-          ">=3.4"
-        ))
-    ) {
-      core.warning(
-        "CodeQL Action v1 will be deprecated on January 18th, 2023. Please upgrade to v2. For " +
-          "more information, see " +
-          "https://github.blog/changelog/2022-04-27-code-scanning-deprecation-of-codeql-action-v1/"
-      );
-    }
+    core.error(
+      "This version of the CodeQL Action was deprecated on January 18th, 2023, and is no longer " +
+        "updated or supported. For better performance, improved security, and new features, " +
+        "upgrade to v2. For more information, see " +
+        "https://github.blog/changelog/2023-01-18-code-scanning-codeql-action-v1-is-now-deprecated/"
+    );
  }
 }