Merge pull request #2240 from github/backport-v2.25.0-df5a14dc2

Merge releases/v3 into releases/v2
Update checked-in dependencies
2025-12-16 04:19:38 +08:00 · 2024-04-15 19:10:56 +01:00 · 2024-04-15 15:53:17 +01:00 · 2024-04-15 15:53:14 +01:00 · 2024-04-15 12:22:19 +00:00 · 2024-04-15 12:22:19 +00:00
548 changed files with 24522 additions and 72189 deletions
--- a/.github/actions/check-codescanning-config/action.yml
+++ b/.github/actions/check-codescanning-config/action.yml
@@ -29,16 +29,7 @@ inputs:
  tools:
    required: true
    description: |
-      The version of CodeQL passed to the `tools` input of the init action.
-      This can be any of the following:
-
-      - A local path to a tarball containing the CodeQL tools, or
-      - A URL to a GitHub release assets containing the CodeQL tools, or
-      - A special value `linked` which is forcing the use of the CodeQL tools
-        that the action has been bundled with.
-
-      If not specified, the Action will check in several places until it finds
-      the CodeQL tools.
+      The url of codeql to use.

 runs:
  using: composite
--- a/.github/actions/check-sarif/action.yml
+++ b/.github/actions/check-sarif/action.yml
@@ -16,5 +16,5 @@ inputs:
      Comma separated list of query ids that should NOT be included in this SARIF file.

 runs:
-  using: node20
+  using: node16
  main: index.js
--- a/.github/actions/query-filter-test/action.yml
+++ b/.github/actions/query-filter-test/action.yml
@@ -23,16 +23,7 @@ inputs:
  tools:
    required: true
    description: |
-      The version of CodeQL passed to the `tools` input of the init action.
-      This can be any of the following:
-
-      - A local path to a tarball containing the CodeQL tools, or
-      - A URL to a GitHub release assets containing the CodeQL tools, or
-      - A special value `linked` which is forcing the use of the CodeQL tools
-        that the action has been bundled with.
-
-      If not specified, the Action will check in several places until it finds
-      the CodeQL tools.
+      The url of codeql to use.

 runs:
  using: composite
--- a/.github/actions/release-initialise/action.yml
+++ b/.github/actions/release-initialise/action.yml
@@ -18,12 +18,12 @@ runs:
    - name: Set up Python
      uses: actions/setup-python@v5
      with:
-        python-version: 3.12
+        python-version: 3.8

    - name: Install dependencies
      run: |
        python -m pip install --upgrade pip
-        pip install PyGithub==2.3.0 requests
+        pip install PyGithub==1.55 requests
      shell: bash

    - name: Update git config
--- a/.github/update-release-branch.py
+++ b/.github/update-release-branch.py
@@ -1,6 +1,5 @@
 import argparse
 import datetime
-import fileinput
 import re
 from github import Github
 import json
@@ -172,19 +171,6 @@ def get_current_version():
  with open('package.json', 'r') as f:
    return json.load(f)['version']

-# `npm version` doesn't always work because of merge conflicts, so we
-# replace the version in package.json textually.
-def replace_version_package_json(prev_version, new_version):
-  prev_line_is_codeql = False
-  for line in fileinput.input('package.json', inplace = True, encoding='utf-8'):
-    if prev_line_is_codeql and f'\"version\": \"{prev_version}\"' in line:
-      print(line.replace(prev_version, new_version), end='')
-    else:
-      prev_line_is_codeql = False
-      print(line, end='') 
-    if '\"name\": \"codeql\",' in line:
-        prev_line_is_codeql = True 
-
 def get_today_string():
  today = datetime.datetime.today()
  return '{:%d %b %Y}'.format(today)
@@ -200,17 +186,16 @@ def process_changelog_for_backports(source_branch_major_version, target_branch_m
  with open('CHANGELOG.md', 'r') as f:

    # until we find the first section, just duplicate all lines
-    found_first_section = False
-    while not found_first_section:
+    while True:
      line = f.readline()
      if not line:
        raise Exception('Could not find any change sections in CHANGELOG.md') # EOF

+      output += line
      if line.startswith('## '):
        line = line.replace(f'## {source_branch_major_version}', f'## {target_branch_major_version}')
-        found_first_section = True
-
-      output += line
+        # we have found the first section, so now handle things differently
+        break

    # found_content tracks whether we hit two headings in a row
    found_content = False
@@ -388,9 +373,9 @@ def main():
      run_git('commit', '--no-edit')

    # Migrate the package version number from a vLatest version number to a vOlder version number
-    print(f'Setting version number to {version} in package.json')
-    replace_version_package_json(get_current_version(), version) # We rely on the `Update dependencies` workflow to update package-lock.json
-    run_git('add', 'package.json')
+    print(f'Setting version number to {version}')
+    subprocess.check_output(['npm', 'version', version, '--no-git-tag-version'])
+    run_git('add', 'package.json', 'package-lock.json')

    # Migrate the changelog notes from vLatest version numbers to vOlder version numbers
    print(f'Migrating changelog notes from v{source_branch_major_version} to v{target_branch_major_version}')
--- a/.github/workflows/__all-platform-bundle.yml
+++ b/.github/workflows/__all-platform-bundle.yml
@@ -25,7 +25,6 @@ on:
 jobs:
  all-platform-bundle:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -40,7 +39,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__analyze-ref-input.yml
+++ b/.github/workflows/__analyze-ref-input.yml
@@ -25,7 +25,6 @@ on:
 jobs:
  analyze-ref-input:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -44,7 +43,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__autobuild-action.yml
+++ b/.github/workflows/__autobuild-action.yml
@@ -25,7 +25,6 @@ on:
 jobs:
  autobuild-action:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -44,7 +43,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__autobuild-direct-tracing.yml
+++ b/.github/workflows/__autobuild-direct-tracing.yml
@@ -1,93 +0,0 @@
-# Warning: This file is generated automatically, and should not be modified.
-# Instead, please modify the template in the pr-checks directory and run:
-#     (cd pr-checks; pip install ruamel.yaml@0.17.31 && python3 sync.py)
-# to regenerate this file.
-
-name: PR Check - Autobuild direct tracing
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  GO111MODULE: auto
-  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
-on:
-  push:
-    branches:
-      - main
-      - releases/v*
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
-  workflow_dispatch: {}
-jobs:
-  autobuild-direct-tracing:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-latest
-            version: latest
-          - os: windows-latest
-            version: latest
-          - os: ubuntu-latest
-            version: nightly-latest
-          - os: windows-latest
-            version: nightly-latest
-    name: Autobuild direct tracing
-    permissions:
-      contents: read
-      security-events: write
-    timeout-minutes: 45
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
-        if: >-
-          runner.os == 'macOS' && (
-
-          matrix.version == 'stable-20230403' ||
-
-          matrix.version == 'stable-v2.13.5' ||
-
-          matrix.version == 'stable-v2.14.6')
-        with:
-          python-version: '3.11'
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-      - name: Set up Java test repo configuration
-        shell: bash
-        run: |
-          mv * .github ../action/tests/multi-language-repo/
-          mv ../action/tests/multi-language-repo/.github/workflows .github
-          mv ../action/tests/java-repo/* .
-
-      - uses: ./../action/init
-        id: init
-        with:
-          build-mode: autobuild
-          db-location: ${{ runner.temp }}/customDbLocation
-          languages: java
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
-
-      - name: Check that indirect tracing is disabled
-        shell: bash
-        run: |
-          if [[ ! -z "${CODEQL_RUNNER}" ]]; then
-            echo "Expected indirect tracing to be disabled, but the" \
-              "CODEQL_RUNNER environment variable is set."
-            exit 1
-          fi
-
-      - uses: ./../action/analyze
-    env:
-      CODEQL_ACTION_AUTOBUILD_BUILD_MODE_DIRECT_TRACING: true
-      CODEQL_ACTION_TEST_MODE: true
--- a/.github/workflows/__build-mode-autobuild.yml
+++ b/.github/workflows/__build-mode-autobuild.yml
@@ -25,7 +25,6 @@ on:
 jobs:
  build-mode-autobuild:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -40,7 +39,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__build-mode-manual.yml
+++ b/.github/workflows/__build-mode-manual.yml
@@ -25,7 +25,6 @@ on:
 jobs:
  build-mode-manual:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -40,7 +39,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__build-mode-none.yml
+++ b/.github/workflows/__build-mode-none.yml
@@ -25,7 +25,6 @@ on:
 jobs:
  build-mode-none:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -42,7 +41,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__build-mode-rollback.yml
+++ b/.github/workflows/__build-mode-rollback.yml
@@ -25,7 +25,6 @@ on:
 jobs:
  build-mode-rollback:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -40,7 +39,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__config-export.yml
+++ b/.github/workflows/__config-export.yml
@@ -25,7 +25,6 @@ on:
 jobs:
  config-export:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -50,7 +49,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__config-input.yml
+++ b/.github/workflows/__config-input.yml
@@ -25,7 +25,6 @@ on:
 jobs:
  config-input:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -40,7 +39,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__cpp-deptrace-disabled.yml
+++ b/.github/workflows/__cpp-deptrace-disabled.yml
@@ -25,7 +25,6 @@ on:
 jobs:
  cpp-deptrace-disabled:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -44,7 +43,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__cpp-deptrace-enabled-on-macos.yml
+++ b/.github/workflows/__cpp-deptrace-enabled-on-macos.yml
@@ -25,7 +25,6 @@ on:
 jobs:
  cpp-deptrace-enabled-on-macos:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: macos-latest
@@ -40,7 +39,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__cpp-deptrace-enabled.yml
+++ b/.github/workflows/__cpp-deptrace-enabled.yml
@@ -25,7 +25,6 @@ on:
 jobs:
  cpp-deptrace-enabled:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -44,7 +43,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__diagnostics-export.yml
+++ b/.github/workflows/__diagnostics-export.yml
@@ -25,12 +25,11 @@ on:
 jobs:
  diagnostics-export:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
            version: stable-20230403
-          - os: macos-12
+          - os: macos-latest
            version: stable-20230403
          - os: windows-latest
            version: stable-20230403
@@ -56,7 +55,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__export-file-baseline-information.yml
+++ b/.github/workflows/__export-file-baseline-information.yml
@@ -25,7 +25,6 @@ on:
 jobs:
  export-file-baseline-information:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -44,7 +43,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__extractor-ram-threads.yml
+++ b/.github/workflows/__extractor-ram-threads.yml
@@ -25,7 +25,6 @@ on:
 jobs:
  extractor-ram-threads:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -40,7 +39,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__go-custom-queries.yml
+++ b/.github/workflows/__go-custom-queries.yml
@@ -25,24 +25,23 @@ on:
 jobs:
  go-custom-queries:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
            version: stable-20230403
-          - os: macos-12
+          - os: macos-latest
            version: stable-20230403
          - os: windows-latest
            version: stable-20230403
          - os: ubuntu-latest
            version: stable-v2.13.5
-          - os: macos-12
+          - os: macos-latest
            version: stable-v2.13.5
          - os: windows-latest
            version: stable-v2.13.5
          - os: ubuntu-latest
            version: stable-v2.14.6
-          - os: macos-12
+          - os: macos-latest
            version: stable-v2.14.6
          - os: windows-latest
            version: stable-v2.14.6
@@ -86,7 +85,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

@@ -103,9 +102,6 @@ jobs:
        with:
          version: ${{ matrix.version }}
          use-all-platform-bundle: 'false'
-      - uses: actions/setup-go@v5
-        with:
-          go-version: '>=1.21.0'
      - uses: ./../action/init
        with:
          languages: go
--- a/.github/workflows/__go-indirect-tracing-workaround-diagnostic.yml
+++ b/.github/workflows/__go-indirect-tracing-workaround-diagnostic.yml
@@ -25,7 +25,6 @@ on:
 jobs:
  go-indirect-tracing-workaround-diagnostic:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -40,7 +39,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__go-indirect-tracing-workaround-no-file-program.yml
+++ b/.github/workflows/__go-indirect-tracing-workaround-no-file-program.yml
@@ -25,7 +25,6 @@ on:
 jobs:
  go-indirect-tracing-workaround-no-file-program:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -40,7 +39,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__go-indirect-tracing-workaround.yml
+++ b/.github/workflows/__go-indirect-tracing-workaround.yml
@@ -25,7 +25,6 @@ on:
 jobs:
  go-indirect-tracing-workaround:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -40,7 +39,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__go-tracing-autobuilder.yml
+++ b/.github/workflows/__go-tracing-autobuilder.yml
@@ -25,20 +25,19 @@ on:
 jobs:
  go-tracing-autobuilder:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
            version: stable-20230403
-          - os: macos-12
+          - os: macos-latest
            version: stable-20230403
          - os: ubuntu-latest
            version: stable-v2.13.5
-          - os: macos-12
+          - os: macos-latest
            version: stable-v2.13.5
          - os: ubuntu-latest
            version: stable-v2.14.6
-          - os: macos-12
+          - os: macos-latest
            version: stable-v2.14.6
          - os: ubuntu-latest
            version: stable-v2.15.5
@@ -70,7 +69,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__go-tracing-custom-build-steps.yml
+++ b/.github/workflows/__go-tracing-custom-build-steps.yml
@@ -25,20 +25,19 @@ on:
 jobs:
  go-tracing-custom-build-steps:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
            version: stable-20230403
-          - os: macos-12
+          - os: macos-latest
            version: stable-20230403
          - os: ubuntu-latest
            version: stable-v2.13.5
-          - os: macos-12
+          - os: macos-latest
            version: stable-v2.13.5
          - os: ubuntu-latest
            version: stable-v2.14.6
-          - os: macos-12
+          - os: macos-latest
            version: stable-v2.14.6
          - os: ubuntu-latest
            version: stable-v2.15.5
@@ -70,7 +69,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__go-tracing-legacy-workflow.yml
+++ b/.github/workflows/__go-tracing-legacy-workflow.yml
@@ -25,20 +25,19 @@ on:
 jobs:
  go-tracing-legacy-workflow:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
            version: stable-20230403
-          - os: macos-12
+          - os: macos-latest
            version: stable-20230403
          - os: ubuntu-latest
            version: stable-v2.13.5
-          - os: macos-12
+          - os: macos-latest
            version: stable-v2.13.5
          - os: ubuntu-latest
            version: stable-v2.14.6
-          - os: macos-12
+          - os: macos-latest
            version: stable-v2.14.6
          - os: ubuntu-latest
            version: stable-v2.15.5
@@ -70,7 +69,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__init-with-registries.yml
+++ b/.github/workflows/__init-with-registries.yml
@@ -25,7 +25,6 @@ on:
 jobs:
  init-with-registries:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -57,7 +56,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__javascript-source-root.yml
+++ b/.github/workflows/__javascript-source-root.yml
@@ -25,7 +25,6 @@ on:
 jobs:
  javascript-source-root:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -44,7 +43,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__language-aliases.yml
+++ b/.github/workflows/__language-aliases.yml
@@ -25,7 +25,6 @@ on:
 jobs:
  language-aliases:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -40,7 +39,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__multi-language-autodetect.yml
+++ b/.github/workflows/__multi-language-autodetect.yml
@@ -25,20 +25,19 @@ on:
 jobs:
  multi-language-autodetect:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
            version: stable-20230403
-          - os: macos-12
+          - os: macos-latest
            version: stable-20230403
          - os: ubuntu-latest
            version: stable-v2.13.5
-          - os: macos-12
+          - os: macos-latest
            version: stable-v2.13.5
          - os: ubuntu-latest
            version: stable-v2.14.6
-          - os: macos-12
+          - os: macos-latest
            version: stable-v2.14.6
          - os: ubuntu-latest
            version: stable-v2.15.5
@@ -70,7 +69,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

@@ -87,10 +86,6 @@ jobs:
        with:
          version: ${{ matrix.version }}
          use-all-platform-bundle: 'false'
-      - uses: actions/setup-go@v5
-        with:
-          go-version: '>=1.21.0'
-
      - uses: ./../action/init
        id: init
        with:
--- a/.github/workflows/__packaging-codescanning-config-inputs-js.yml
+++ b/.github/workflows/__packaging-codescanning-config-inputs-js.yml
@@ -25,7 +25,6 @@ on:
 jobs:
  packaging-codescanning-config-inputs-js:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -56,7 +55,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__packaging-config-inputs-js.yml
+++ b/.github/workflows/__packaging-config-inputs-js.yml
@@ -25,7 +25,6 @@ on:
 jobs:
  packaging-config-inputs-js:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -56,7 +55,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__packaging-config-js.yml
+++ b/.github/workflows/__packaging-config-js.yml
@@ -25,7 +25,6 @@ on:
 jobs:
  packaging-config-js:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -56,7 +55,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__packaging-inputs-js.yml
+++ b/.github/workflows/__packaging-inputs-js.yml
@@ -25,7 +25,6 @@ on:
 jobs:
  packaging-inputs-js:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -56,7 +55,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__remote-config.yml
+++ b/.github/workflows/__remote-config.yml
@@ -25,24 +25,23 @@ on:
 jobs:
  remote-config:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
            version: stable-20230403
-          - os: macos-12
+          - os: macos-latest
            version: stable-20230403
          - os: windows-latest
            version: stable-20230403
          - os: ubuntu-latest
            version: stable-v2.13.5
-          - os: macos-12
+          - os: macos-latest
            version: stable-v2.13.5
          - os: windows-latest
            version: stable-v2.13.5
          - os: ubuntu-latest
            version: stable-v2.14.6
-          - os: macos-12
+          - os: macos-latest
            version: stable-v2.14.6
          - os: windows-latest
            version: stable-v2.14.6
@@ -86,7 +85,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__resolve-environment-action.yml
+++ b/.github/workflows/__resolve-environment-action.yml
@@ -25,12 +25,11 @@ on:
 jobs:
  resolve-environment-action:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
            version: stable-v2.13.4
-          - os: macos-12
+          - os: macos-latest
            version: stable-v2.13.4
          - os: windows-latest
            version: stable-v2.13.4
@@ -62,7 +61,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__rubocop-multi-language.yml
+++ b/.github/workflows/__rubocop-multi-language.yml
@@ -25,7 +25,6 @@ on:
 jobs:
  rubocop-multi-language:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -40,7 +39,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__ruby.yml
+++ b/.github/workflows/__ruby.yml
@@ -25,7 +25,6 @@ on:
 jobs:
  ruby:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -50,7 +49,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__scaling-reserved-ram.yml
+++ b/.github/workflows/__scaling-reserved-ram.yml
@@ -25,20 +25,19 @@ on:
 jobs:
  scaling-reserved-ram:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
            version: stable-20230403
-          - os: macos-12
+          - os: macos-latest
            version: stable-20230403
          - os: ubuntu-latest
            version: stable-v2.13.5
-          - os: macos-12
+          - os: macos-latest
            version: stable-v2.13.5
          - os: ubuntu-latest
            version: stable-v2.14.6
-          - os: macos-12
+          - os: macos-latest
            version: stable-v2.14.6
          - os: ubuntu-latest
            version: stable-v2.15.5
@@ -70,7 +69,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

@@ -87,10 +86,6 @@ jobs:
        with:
          version: ${{ matrix.version }}
          use-all-platform-bundle: 'false'
-      - uses: actions/setup-go@v5
-        with:
-          go-version: '>=1.21.0'
-
      - uses: ./../action/init
        id: init
        with:
--- a/.github/workflows/__split-workflow.yml
+++ b/.github/workflows/__split-workflow.yml
@@ -25,7 +25,6 @@ on:
 jobs:
  split-workflow:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -50,7 +49,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__submit-sarif-failure.yml
+++ b/.github/workflows/__submit-sarif-failure.yml
@@ -25,7 +25,6 @@ on:
 jobs:
  submit-sarif-failure:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -44,7 +43,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__swift-custom-build.yml
+++ b/.github/workflows/__swift-custom-build.yml
@@ -25,7 +25,6 @@ on:
 jobs:
  swift-custom-build:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -50,7 +49,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__test-autobuild-working-dir.yml
+++ b/.github/workflows/__test-autobuild-working-dir.yml
@@ -25,7 +25,6 @@ on:
 jobs:
  test-autobuild-working-dir:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -40,7 +39,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__test-local-codeql.yml
+++ b/.github/workflows/__test-local-codeql.yml
@@ -25,7 +25,6 @@ on:
 jobs:
  test-local-codeql:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -40,7 +39,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__test-proxy.yml
+++ b/.github/workflows/__test-proxy.yml
@@ -25,7 +25,6 @@ on:
 jobs:
  test-proxy:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -40,7 +39,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__unset-environment.yml
+++ b/.github/workflows/__unset-environment.yml
@@ -25,7 +25,6 @@ on:
 jobs:
  unset-environment:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -54,7 +53,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__upload-ref-sha-input.yml
+++ b/.github/workflows/__upload-ref-sha-input.yml
@@ -25,7 +25,6 @@ on:
 jobs:
  upload-ref-sha-input:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -44,7 +43,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/__with-checkout-path.yml
+++ b/.github/workflows/__with-checkout-path.yml
@@ -25,7 +25,6 @@ on:
 jobs:
  with-checkout-path:
    strategy:
-      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -44,7 +43,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          runner.os == 'macOS' && (
+          matrix.os == 'macos-latest' && (

          matrix.version == 'stable-20230403' ||

--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -73,7 +73,6 @@ jobs:
  build:
    needs: [check-codeql-versions]
    strategy:
-      fail-fast: false
      matrix:
        os: [ubuntu-20.04,ubuntu-22.04,windows-2019,windows-2022,macos-11,macos-12,macos-13]
        tools: ${{ fromJson(needs.check-codeql-versions.outputs.versions) }}
--- a/.github/workflows/codescanning-config-cli.yml
+++ b/.github/workflows/codescanning-config-cli.yml
@@ -24,7 +24,6 @@ jobs:
    continue-on-error: true

    strategy:
-      fail-fast: false
      matrix:
        include:
        - os: ubuntu-latest
--- a/.github/workflows/debug-artifacts.yml
+++ b/.github/workflows/debug-artifacts.yml
@@ -22,7 +22,6 @@ on:
 jobs:
  upload-artifacts:
    strategy:
-      fail-fast: false
      matrix:
        version:
        - stable-20230403
--- a/.github/workflows/pr-checks.yml
+++ b/.github/workflows/pr-checks.yml
@@ -16,9 +16,8 @@ jobs:
    timeout-minutes: 45

    strategy:
-      fail-fast: false
      matrix:
-        node-types-version: [16.11, current] # run tests on 16.11 while CodeQL Action v2 is still supported
+        node-types-version: [16.11, current] # we backport this matrix job in order to maintain the same check names

    steps:
      - name: Checkout
@@ -50,6 +49,7 @@ jobs:
          fi

      - name: Check generated JS
+        if: matrix.node-types-version != 'current' # we do not need to test the newer node on the v2 branch
        run: .github/workflows/script/check-js.sh

  check-node-modules:
@@ -90,7 +90,6 @@ jobs:
    name: Unit Test
    needs: [check-js, check-node-modules]
    strategy:
-      fail-fast: false
      matrix:
        os: [ubuntu-latest, macos-latest, windows-latest]
    runs-on: ${{ matrix.os }}
--- a/.github/workflows/test-codeql-bundle-all.yml
+++ b/.github/workflows/test-codeql-bundle-all.yml
@@ -22,7 +22,6 @@ on:
 jobs:
  test-codeql-bundle-all:
    strategy:
-      fail-fast: false
      matrix:
        include:
        - os: ubuntu-latest
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,118 +4,87 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th

 Note that the only difference between `v2` and `v3` of the CodeQL Action is the node version they support, with `v3` running on node 20 while we continue to release `v2` to support running on node 16. For example `3.22.11` was the first `v3` release and is functionally identical to `2.22.11`. This approach ensures an easy way to track exactly which features are included in different versions, indicated by the minor and patch version numbers.

-## 3.25.6 - 20 May 2024
-
- Update default CodeQL bundle version to 2.17.3. [#2295](https://github.com/github/codeql-action/pull/2295)
-
-## 3.25.5 - 13 May 2024
-
- Add a compatibility matrix of supported CodeQL Action, CodeQL CLI, and GitHub Enterprise Server versions to the [README.md](README.md). [#2273](https://github.com/github/codeql-action/pull/2273)
- Avoid printing out a warning for a missing `on.push` trigger when the CodeQL Action is triggered via a `workflow_call` event. [#2274](https://github.com/github/codeql-action/pull/2274)
- The `tools: latest` input to the `init` Action has been renamed to `tools: linked`. This option specifies that the Action should use the tools shipped at the same time as the Action. The old name will continue to work for backwards compatibility, but we recommend that new workflows use the new name. [#2281](https://github.com/github/codeql-action/pull/2281)
-
-## 3.25.4 - 08 May 2024
-
- Update default CodeQL bundle version to 2.17.2. [#2270](https://github.com/github/codeql-action/pull/2270)
-
-## 3.25.3 - 25 Apr 2024
-
- Update default CodeQL bundle version to 2.17.1. [#2247](https://github.com/github/codeql-action/pull/2247)
- Workflows running on `macos-latest` using CodeQL CLI versions before v2.15.1 will need to either upgrade their CLI version to v2.15.1 or newer, or change the platform to an Intel MacOS runner, such as `macos-12`. ARM machines with SIP disabled, including the newest `macos-latest` image, are unsupported for CLI versions before 2.15.1. [#2261](https://github.com/github/codeql-action/pull/2261)
-
-## 3.25.2 - 22 Apr 2024
-
-No user facing changes.
-
-## 3.25.1 - 17 Apr 2024
-
- We are rolling out a feature in April/May 2024 that improves the reliability and performance of analyzing code when analyzing a compiled language with the `autobuild` [build mode](https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#codeql-build-modes). [#2235](https://github.com/github/codeql-action/pull/2235)
- Fix a bug where the `init` Action would fail if `--overwrite` was specified in `CODEQL_ACTION_EXTRA_OPTIONS`. [#2245](https://github.com/github/codeql-action/pull/2245)
-
-## 3.25.0 - 15 Apr 2024
+## 2.25.0 - 15 Apr 2024

 - The deprecated feature for extracting dependencies for a Python analysis has been removed. [#2224](https://github.com/github/codeql-action/pull/2224)
-
  As a result, the following inputs and environment variables are now ignored:
-
  - The `setup-python-dependencies` input to the `init` Action
  - The `CODEQL_ACTION_DISABLE_PYTHON_DEPENDENCY_INSTALLATION` environment variable
-
  We recommend removing any references to these from your workflows. For more information, see the release notes for CodeQL Action v3.23.0 and v2.23.0.
 - Automatically overwrite an existing database if found on the filesystem. [#2229](https://github.com/github/codeql-action/pull/2229)
 - Bump the minimum CodeQL bundle version to 2.12.6. [#2232](https://github.com/github/codeql-action/pull/2232)
 - A more relevant log message and a diagnostic are now emitted when the `file` program is not installed on a Linux runner, but is required for Go tracing to succeed. [#2234](https://github.com/github/codeql-action/pull/2234)

-## 3.24.10 - 05 Apr 2024
+## 2.24.10 - 05 Apr 2024

 - Update default CodeQL bundle version to 2.17.0. [#2219](https://github.com/github/codeql-action/pull/2219)
 - Add a deprecation warning for customers using CodeQL version 2.12.5 and earlier. These versions of CodeQL were discontinued on 26 March 2024 alongside GitHub Enterprise Server 3.8, and will be unsupported by CodeQL Action versions 3.25.0 and later and versions 2.25.0 and later. [#2220](https://github.com/github/codeql-action/pull/2220)
  - If you are using one of these versions, please update to CodeQL CLI version 2.12.6 or later. For instance, if you have specified a custom version of the CLI using the 'tools' input to the 'init' Action, you can remove this input to use the default version.
  - Alternatively, if you want to continue using a version of the CodeQL CLI between 2.11.6 and 2.12.5, you can replace `github/codeql-action/*@v3` by `github/codeql-action/*@v3.24.10` and `github/codeql-action/*@v2` by `github/codeql-action/*@v2.24.10` in your code scanning workflow to ensure you continue using this version of the CodeQL Action.

-## 3.24.9 - 22 Mar 2024
+## 2.24.9 - 22 Mar 2024

 - Update default CodeQL bundle version to 2.16.5. [#2203](https://github.com/github/codeql-action/pull/2203)

-## 3.24.8 - 18 Mar 2024
+## 2.24.8 - 18 Mar 2024

 - Improve the ease of debugging extraction issues by increasing the verbosity of the extractor logs when running in debug mode. [#2195](https://github.com/github/codeql-action/pull/2195)

-## 3.24.7 - 12 Mar 2024
+## 2.24.7 - 12 Mar 2024

 - Update default CodeQL bundle version to 2.16.4. [#2185](https://github.com/github/codeql-action/pull/2185)

-## 3.24.6 - 29 Feb 2024
+## 2.24.6 - 29 Feb 2024

 No user facing changes.

-## 3.24.5 - 23 Feb 2024
+## 2.24.5 - 23 Feb 2024

 - Update default CodeQL bundle version to 2.16.3. [#2156](https://github.com/github/codeql-action/pull/2156)

-## 3.24.4 - 21 Feb 2024
+## 2.24.4 - 21 Feb 2024

 - Fix an issue where an existing, but empty, `/sys/fs/cgroup/cpuset.cpus` file always resulted in a single-threaded run. [#2151](https://github.com/github/codeql-action/pull/2151)

-## 3.24.3 - 15 Feb 2024
+## 2.24.3 - 15 Feb 2024

 - Fix an issue where the CodeQL Action would fail to load a configuration specified by the `config` input to the `init` Action. [#2147](https://github.com/github/codeql-action/pull/2147)

-## 3.24.2 - 15 Feb 2024
+## 2.24.2 - 15 Feb 2024

 - Enable improved multi-threaded performance on larger runners for GitHub Enterprise Server users. This feature is already available to GitHub.com users. [#2141](https://github.com/github/codeql-action/pull/2141)

-## 3.24.1 - 13 Feb 2024
+## 2.24.1 - 13 Feb 2024

 - Update default CodeQL bundle version to 2.16.2. [#2124](https://github.com/github/codeql-action/pull/2124)
 - The CodeQL action no longer fails if it can't write to the telemetry api endpoint. [#2121](https://github.com/github/codeql-action/pull/2121)

-## 3.24.0 - 02 Feb 2024
+## 2.24.0 - 02 Feb 2024

 - CodeQL Python analysis will no longer install dependencies on GitHub Enterprise Server, as is already the case for GitHub.com. See [release notes for 3.23.0](#3230---08-jan-2024) for more details. [#2106](https://github.com/github/codeql-action/pull/2106)

-## 3.23.2 - 26 Jan 2024
+## 2.23.2 - 26 Jan 2024

 - On Linux, the maximum possible value for the `--threads` option now respects the CPU count as specified in `cgroup` files to more accurately reflect the number of available cores when running in containers. [#2083](https://github.com/github/codeql-action/pull/2083)
 - Update default CodeQL bundle version to 2.16.1. [#2096](https://github.com/github/codeql-action/pull/2096)

-## 3.23.1 - 17 Jan 2024
+## 2.23.1 - 17 Jan 2024

 - Update default CodeQL bundle version to 2.16.0. [#2073](https://github.com/github/codeql-action/pull/2073)
 - Change the retention period for uploaded debug artifacts to 7 days. Previously, this was whatever the repository default was. [#2079](https://github.com/github/codeql-action/pull/2079)

-## 3.23.0 - 08 Jan 2024
+## 2.23.0 - 08 Jan 2024

 - We are rolling out a feature in January 2024 that will disable Python dependency installation by default for all users. This improves the speed of analysis while having only a very minor impact on results. You can override this behavior by setting `CODEQL_ACTION_DISABLE_PYTHON_DEPENDENCY_INSTALLATION=false` in your workflow, however we plan to remove this ability in future versions of the CodeQL Action. [#2031](https://github.com/github/codeql-action/pull/2031)
 - The CodeQL Action now requires CodeQL version 2.11.6 or later. For more information, see [the corresponding changelog entry for CodeQL Action version 2.22.7](#2227---16-nov-2023). [#2009](https://github.com/github/codeql-action/pull/2009)

-## 3.22.12 - 22 Dec 2023
+## 2.22.12 - 22 Dec 2023

 - Update default CodeQL bundle version to 2.15.5. [#2047](https://github.com/github/codeql-action/pull/2047)

-## 3.22.11 - 13 Dec 2023
+## 2.22.11 - 13 Dec 2023

- [v3+ only] The CodeQL Action now runs on Node.js v20. [#2006](https://github.com/github/codeql-action/pull/2006)
+No user facing changes.

 ## 2.22.10 - 12 Dec 2023

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -3,7 +3,6 @@
 [fork]: https://github.com/github/codeql-action/fork
 [pr]: https://github.com/github/codeql-action/compare
 [code-of-conduct]: CODE_OF_CONDUCT.md
-[readme]: README.md#supported-versions-of-the-codeql-cli-and-github-enterprise-server

 Hi there! We're thrilled that you'd like to contribute to this project. Your help is essential for keeping it great.

@@ -85,7 +84,6 @@ We typically deprecate a version of CodeQL when the GitHub Enterprise Server (GH
 1. Notify users using the old version of CodeQL about the deprecation.
    - Update `CODEQL_NEXT_MINIMUM_VERSION`, `GHES_VERSION_MOST_RECENTLY_DEPRECATED`, and `GHES_MOST_RECENT_DEPRECATION_DATE` in `src/codeql.ts` to reflect the new minimum version of CodeQL and the GHES version that has just been deprecated.
    - Add a changelog note announcing the deprecation.
-    - Update the CLI version referenced in the [readme] by adding a new row to the compatibility table.
    - Example PR: https://github.com/github/codeql-action/pull/1884
 1. Release the Action, or wait for the next scheduled release of the Action, then wait at least a week so users have time to see and act on the deprecation warning.
 1. Remove support for the old version of CodeQL.
--- a/README.md
+++ b/README.md
@@ -33,22 +33,6 @@ To provide the best experience to customers using older versions of GitHub Enter

 For more information, see "[Code scanning: deprecation of CodeQL Action v2](https://github.blog/changelog/2024-01-12-code-scanning-deprecation-of-codeql-action-v2/)."

-## Supported versions of the CodeQL CLI and GitHub Enterprise Server
-
-We typically release new minor versions of the CodeQL Action and CLI when a new minor version of GitHub Enterprise Server (GHES) is released. When a version of GHES is deprecated, the CodeQL Action and CLI releases that shipped with it are deprecated as well.
-
-| Recommended CodeQL Action | Recommended CodeQL CLI Version | GitHub Environment |
-|---------|----------|--------------|
-| `v3` | default (do not pass a `tools` input) | GitHub.com |
-| `3.22.12` | `2.15.5` | Enterprise Server 3.12 |
-| `2.22.1` | `2.14.6` | Enterprise Server 3.11 |
-| `2.20.3` | `2.13.5` | Enterprise Server 3.10 |
-| `2.2.9` | `2.12.5` | Enterprise Server 3.9 |
-
-CodeQL Action `v2` will stop receiving updates when GHES 3.11 is deprecated.
-
-See the full list of GHES release and deprecation dates at [GitHub Enterprise Server releases](https://docs.github.com/en/enterprise-server/admin/all-releases#releases-of-github-enterprise-server).
-
 ## Troubleshooting

 Read about [troubleshooting code scanning](https://docs.github.com/en/code-security/code-scanning/troubleshooting-code-scanning).
--- a/analyze/action.yml
+++ b/analyze/action.yml
@@ -86,6 +86,6 @@ outputs:
  sarif-id:
    description: The ID of the uploaded SARIF file.
 runs:
-  using: node20
+  using: node16
  main: "../lib/analyze-action.js"
  post: "../lib/analyze-action-post.js"
--- a/autobuild/action.yml
+++ b/autobuild/action.yml
@@ -15,5 +15,5 @@ inputs:
      $GITHUB_WORKSPACE as its working directory.
    required: false
 runs:
-  using: node20
+  using: node16
  main: '../lib/autobuild-action.js'
--- a/init/action.yml
+++ b/init/action.yml
@@ -3,19 +3,9 @@ description: 'Set up CodeQL'
 author: 'GitHub'
 inputs:
  tools:
-    description: >-
-      By default, the Action will use the recommended version of the CodeQL
-      Bundle to analyze your project. You can override this choice using this
-      input. One of:
-
-      - A local path to a CodeQL Bundle tarball, or
-      - The URL of a CodeQL Bundle tarball GitHub release asset, or
-      - A special value `linked` which uses the version of the CodeQL tools
-        that the Action has been bundled with.
-
-      If not specified, the Action will check in several places until it finds
-      the CodeQL tools.
+    description: URL of CodeQL tools
    required: false
+    # If not specified the Action will check in several places until it finds the CodeQL tools.
  languages:
    description: >-
      A comma-separated list of CodeQL languages to analyze.
@@ -36,7 +26,10 @@ inputs:
      - `none`:      The database will be created without building the source code.
                     Available for all interpreted languages and some compiled languages.
      - `autobuild`: The database will be created by attempting to automatically build the source
-                     code. Available for all compiled languages.
+                     code.
+                     To use this build mode, ensure that your workflow calls the `autobuild` action
+                     between the `init` and `analyze` steps.
+                     Available for all compiled languages.
      - `manual`:   The database will be created by building the source code using a manually
                     specified build command. To use this build mode, specify manual build steps in
                     your workflow between the `init` and `analyze` steps. Available for all
@@ -140,6 +133,6 @@ outputs:
  codeql-path:
    description: The path of the CodeQL binary used for analysis
 runs:
-  using: node20
+  using: node16
  main: '../lib/init-action.js'
  post: '../lib/init-action-post.js'
--- a/lib/analyze-action.js
+++ b/lib/analyze-action.js
@@ -107,7 +107,7 @@ function doesGoExtractionOutputExist(config) {
 * - We approximate whether manual build steps are present by looking at
 * whether any extraction output already exists for Go.
 */
-async function runAutobuildIfLegacyGoWorkflow(config, features, logger) {
+async function runAutobuildIfLegacyGoWorkflow(config, logger) {
    if (!config.languages.includes(languages_1.Language.go)) {
        return;
    }
@@ -134,7 +134,7 @@ async function runAutobuildIfLegacyGoWorkflow(config, features, logger) {
        return;
    }
    logger.debug("Running Go autobuild because extraction output (TRAP files) for Go code has not been found.");
-    await (0, autobuild_1.runAutobuild)(config, languages_1.Language.go, features, logger);
+    await (0, autobuild_1.runAutobuild)(languages_1.Language.go, config, logger);
 }
 async function run() {
    const startedAt = new Date();
@@ -155,7 +155,6 @@ async function run() {
        if (config === undefined) {
            throw new Error("Config file could not be found at expected location. Has the 'init' action been called?");
        }
-        const codeql = await (0, codeql_1.getCodeQL)(config.codeQLCmd);
        if (hasBadExpectErrorInput()) {
            throw new util.ConfigurationError("`expect-error` input parameter is for internal use only. It should only be set by codeql-action or a fork.");
        }
@@ -168,8 +167,8 @@ async function run() {
        const features = new feature_flags_1.Features(gitHubVersion, repositoryNwo, actionsUtil.getTemporaryDirectory(), logger);
        const memory = util.getMemoryFlag(actionsUtil.getOptionalInput("ram") || process.env["CODEQL_RAM"], logger);
        await (0, analyze_1.warnIfGoInstalledAfterInit)(config, logger);
-        await runAutobuildIfLegacyGoWorkflow(config, features, logger);
-        dbCreationTimings = await (0, analyze_1.runFinalize)(outputDir, threads, memory, codeql, config, features, logger);
+        await runAutobuildIfLegacyGoWorkflow(config, logger);
+        dbCreationTimings = await (0, analyze_1.runFinalize)(outputDir, threads, memory, config, logger);
        if (actionsUtil.getRequiredInput("skip-queries") !== "true") {
            runStats = await (0, analyze_1.runQueries)(outputDir, memory, util.getAddSnippetsFlag(actionsUtil.getRequiredInput("add-snippets")), threads, actionsUtil.getOptionalInput("category"), config, logger, features);
        }
@@ -194,6 +193,7 @@ async function run() {
        await (0, database_upload_1.uploadDatabases)(repositoryNwo, config, apiDetails, logger);
        // Possibly upload the TRAP caches for later re-use
        const trapCacheUploadStartTime = perf_hooks_1.performance.now();
+        const codeql = await (0, codeql_1.getCodeQL)(config.codeQLCmd);
        didUploadTrapCaches = await (0, trap_caching_1.uploadTrapCaches)(codeql, config, logger);
        trapCacheUploadTime = perf_hooks_1.performance.now() - trapCacheUploadStartTime;
        // We don't upload results in test mode, so don't wait for processing
--- a/lib/analyze-action.js.map
+++ b/lib/analyze-action.js.map
--- a/lib/analyze.js
+++ b/lib/analyze.js
@@ -35,6 +35,7 @@ const del_1 = __importDefault(require("del"));
 const yaml = __importStar(require("js-yaml"));
 const autobuild_1 = require("./autobuild");
 const codeql_1 = require("./codeql");
+const config_utils_1 = require("./config-utils");
 const diagnostics_1 = require("./diagnostics");
 const environment_1 = require("./environment");
 const feature_flags_1 = require("./feature-flags");
@@ -43,7 +44,6 @@ const tools_features_1 = require("./tools-features");
 const tracer_config_1 = require("./tracer-config");
 const upload_lib_1 = require("./upload-lib");
 const util = __importStar(require("./util"));
-const util_1 = require("./util");
 class CodeQLAnalysisError extends Error {
    constructor(queriesStatusReport, message) {
        super(message);
@@ -76,10 +76,27 @@ async function runExtraction(codeql, config, logger) {
            if (config.buildMode &&
                (await codeql.supportsFeature(tools_features_1.ToolsFeature.TraceCommandUseBuildMode))) {
                if (language === languages_1.Language.cpp &&
-                    config.buildMode === util_1.BuildMode.Autobuild) {
+                    config.buildMode === config_utils_1.BuildMode.Autobuild) {
                    await (0, autobuild_1.setupCppAutobuild)(codeql, logger);
                }
-                await codeql.extractUsingBuildMode(config, language);
+                try {
+                    await codeql.extractUsingBuildMode(config, language);
+                }
+                catch (e) {
+                    if (config.buildMode === config_utils_1.BuildMode.Autobuild) {
+                        const prefix = "We were unable to automatically build your code. " +
+                            "Please change the build mode for this language to manual and specify build steps " +
+                            "for your project. For more information, see " +
+                            "https://docs.github.com/en/code-security/code-scanning/troubleshooting-code-scanning/automatic-build-failed.";
+                        const ErrorConstructor = e instanceof util.ConfigurationError
+                            ? util.ConfigurationError
+                            : Error;
+                        throw new ErrorConstructor(`${prefix} ${util.wrapError(e).message}`);
+                    }
+                    else {
+                        throw e;
+                    }
+                }
            }
            else {
                await codeql.extractScannedLanguage(config, language);
@@ -90,8 +107,8 @@ async function runExtraction(codeql, config, logger) {
 }
 exports.runExtraction = runExtraction;
 function shouldExtractLanguage(config, language) {
-    return (config.buildMode === util_1.BuildMode.None ||
-        (config.buildMode === util_1.BuildMode.Autobuild &&
+    return (config.buildMode === config_utils_1.BuildMode.None ||
+        (config.buildMode === config_utils_1.BuildMode.Autobuild &&
            process.env[environment_1.EnvVar.AUTOBUILD_DID_COMPLETE_SUCCESSFULLY] !== "true") ||
        (!config.buildMode && (0, languages_1.isScannedLanguage)(language)));
 }
@@ -107,7 +124,8 @@ function dbIsFinalized(config, language, logger) {
    }
 }
 exports.dbIsFinalized = dbIsFinalized;
-async function finalizeDatabaseCreation(codeql, config, threadsFlag, memoryFlag, logger) {
+async function finalizeDatabaseCreation(config, threadsFlag, memoryFlag, logger) {
+    const codeql = await (0, codeql_1.getCodeQL)(config.codeQLCmd);
    const extractionStart = perf_hooks_1.performance.now();
    await runExtraction(codeql, config, logger);
    const extractionTime = perf_hooks_1.performance.now() - extractionStart;
@@ -174,7 +192,7 @@ async function runQueries(sarifFolder, memoryFlag, addSnippetsFlag, threadsFlag,
                }
                statusReport["event_reports"].push(perQueryAlertCountEventReport);
            }
-            if (!(await util.codeQlVersionAtLeast(codeql, codeql_1.CODEQL_VERSION_ANALYSIS_SUMMARY_V2))) {
+            if (!(await util.codeQlVersionAbove(codeql, codeql_1.CODEQL_VERSION_ANALYSIS_SUMMARY_V2))) {
                await runPrintLinesOfCode(language);
            }
        }
@@ -214,7 +232,7 @@ async function runQueries(sarifFolder, memoryFlag, addSnippetsFlag, threadsFlag,
    }
 }
 exports.runQueries = runQueries;
-async function runFinalize(outputDir, threadsFlag, memoryFlag, codeql, config, features, logger) {
+async function runFinalize(outputDir, threadsFlag, memoryFlag, config, logger) {
    try {
        await (0, del_1.default)(outputDir, { force: true });
    }
@@ -224,11 +242,14 @@ async function runFinalize(outputDir, threadsFlag, memoryFlag, codeql, config, f
        }
    }
    await fs.promises.mkdir(outputDir, { recursive: true });
-    const timings = await finalizeDatabaseCreation(codeql, config, threadsFlag, memoryFlag, logger);
-    // If we didn't already end tracing in the autobuild Action, end it now.
-    if (process.env[environment_1.EnvVar.AUTOBUILD_DID_COMPLETE_SUCCESSFULLY] !== "true") {
-        await (0, tracer_config_1.endTracingForCluster)(codeql, config, logger, features);
-    }
+    const timings = await finalizeDatabaseCreation(config, threadsFlag, memoryFlag, logger);
+    // WARNING: This does not _really_ end tracing, as the tracer will restore its
+    // critical environment variables and it'll still be active for all processes
+    // launched from this build step.
+    // However, it will stop tracing for all steps past the codeql-action/analyze
+    // step.
+    // Delete variables as specified by the end-tracing script
+    await (0, tracer_config_1.endTracingForCluster)(config);
    return timings;
 }
 exports.runFinalize = runFinalize;
--- a/lib/analyze.js.map
+++ b/lib/analyze.js.map
--- a/lib/api-client.js
+++ b/lib/api-client.js
@@ -166,7 +166,6 @@ exports.computeAutomationID = computeAutomationID;
 function wrapApiConfigurationError(e) {
    if ((0, util_1.isHTTPError)(e)) {
        if (e.message.includes("API rate limit exceeded for site ID installation") ||
-            e.message.includes("commit not found") ||
            /^ref .* not found in this repository$/.test(e.message)) {
            return new util_1.ConfigurationError(e.message);
        }
--- a/lib/api-client.js.map
+++ b/lib/api-client.js.map
@@ -1 +1 @@
-{"version":3,"file":"api-client.js","sourceRoot":"","sources":["../src/api-client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"api-client.js","sourceRoot":"","sources":["../src/api-client.ts"],"names":[],"mappings":"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"}
--- a/lib/autobuild-action.js
+++ b/lib/autobuild-action.js
@@ -30,11 +30,8 @@ const autobuild_1 = require("./autobuild");
 const codeql_1 = require("./codeql");
 const config_utils_1 = require("./config-utils");
 const environment_1 = require("./environment");
-const feature_flags_1 = require("./feature-flags");
 const logging_1 = require("./logging");
-const repository_1 = require("./repository");
 const status_report_1 = require("./status-report");
-const tracer_config_1 = require("./tracer-config");
 const util_1 = require("./util");
 async function sendCompletedStatusReport(config, logger, startedAt, allLanguages, failingLanguage, cause) {
    (0, util_1.initializeEnvironment)((0, actions_util_1.getActionVersion)());
@@ -63,8 +60,6 @@ async function run() {
        const gitHubVersion = await (0, api_client_1.getGitHubVersion)();
        (0, util_1.checkGitHubVersionInRange)(gitHubVersion, logger);
        (0, util_1.checkActionVersion)((0, actions_util_1.getActionVersion)(), gitHubVersion);
-        const repositoryNwo = (0, repository_1.parseRepositoryNwo)((0, util_1.getRequiredEnvParam)("GITHUB_REPOSITORY"));
-        const features = new feature_flags_1.Features(gitHubVersion, repositoryNwo, (0, actions_util_1.getTemporaryDirectory)(), logger);
        config = await (0, config_utils_1.getConfig)((0, actions_util_1.getTemporaryDirectory)(), logger);
        if (config === undefined) {
            throw new Error("Config file could not be found at expected location. Has the 'init' action been called?");
@@ -79,12 +74,9 @@ async function run() {
            }
            for (const language of languages) {
                currentLanguage = language;
-                await (0, autobuild_1.runAutobuild)(config, language, features, logger);
+                await (0, autobuild_1.runAutobuild)(language, config, logger);
            }
        }
-        // End tracing early to avoid tracing analyze. This improves the performance and reliability of
-        // the analyze step.
-        await (0, tracer_config_1.endTracingForCluster)(codeql, config, logger, features);
    }
    catch (unwrappedError) {
        const error = (0, util_1.wrapError)(unwrappedError);
--- a/lib/autobuild-action.js.map
+++ b/lib/autobuild-action.js.map
@@ -1 +1 @@
-{"version":3,"file":"autobuild-action.js","sourceRoot":"","sources":["../src/autobuild-action.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"autobuild-action.js","sourceRoot":"","sources":["../src/autobuild-action.ts"],"names":[],"mappings":"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"}
--- a/lib/autobuild.js
+++ b/lib/autobuild.js
@@ -28,6 +28,7 @@ const core = __importStar(require("@actions/core"));
 const actions_util_1 = require("./actions-util");
 const api_client_1 = require("./api-client");
 const codeql_1 = require("./codeql");
+const config_utils_1 = require("./config-utils");
 const environment_1 = require("./environment");
 const feature_flags_1 = require("./feature-flags");
 const languages_1 = require("./languages");
@@ -35,9 +36,9 @@ const repository_1 = require("./repository");
 const tools_features_1 = require("./tools-features");
 const util_1 = require("./util");
 async function determineAutobuildLanguages(codeql, config, logger) {
-    if ((config.buildMode === util_1.BuildMode.None &&
+    if ((config.buildMode === config_utils_1.BuildMode.None &&
        (await codeql.supportsFeature(tools_features_1.ToolsFeature.TraceCommandUseBuildMode))) ||
-        config.buildMode === util_1.BuildMode.Manual) {
+        config.buildMode === config_utils_1.BuildMode.Manual) {
        logger.info(`Using ${config.buildMode} build mode, nothing to autobuild.`);
        return undefined;
    }
@@ -134,19 +135,13 @@ async function setupCppAutobuild(codeql, logger) {
    }
 }
 exports.setupCppAutobuild = setupCppAutobuild;
-async function runAutobuild(config, language, features, logger) {
+async function runAutobuild(language, config, logger) {
    logger.startGroup(`Attempting to automatically build ${language} code`);
    const codeQL = await (0, codeql_1.getCodeQL)(config.codeQLCmd);
    if (language === languages_1.Language.cpp) {
        await setupCppAutobuild(codeQL, logger);
    }
-    if (config.buildMode &&
-        (await features.getValue(feature_flags_1.Feature.AutobuildDirectTracing, codeQL))) {
-        await codeQL.extractUsingBuildMode(config, language);
-    }
-    else {
-        await codeQL.runAutobuild(config, language);
-    }
+    await codeQL.runAutobuild(language, config.debugMode);
    if (language === languages_1.Language.go) {
        core.exportVariable(environment_1.EnvVar.DID_AUTOBUILD_GOLANG, "true");
    }
--- a/lib/autobuild.js.map
+++ b/lib/autobuild.js.map
@@ -1 +1 @@
-{"version":3,"file":"autobuild.js","sourceRoot":"","sources":["../src/autobuild.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"autobuild.js","sourceRoot":"","sources":["../src/autobuild.ts"],"names":[],"mappings":"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"}
--- a/lib/cli-errors.js
+++ b/lib/cli-errors.js
@@ -116,8 +116,6 @@ function ensureEndsInPeriod(text) {
 /** Error messages from the CLI that we consider configuration errors and handle specially. */
 var CliConfigErrorCategory;
 (function (CliConfigErrorCategory) {
-    CliConfigErrorCategory["ExternalRepositoryCloneFailed"] = "ExternalRepositoryCloneFailed";
-    CliConfigErrorCategory["GracefulOutOfMemory"] = "GracefulOutOfMemory";
    CliConfigErrorCategory["GradleBuildFailed"] = "GradleBuildFailed";
    CliConfigErrorCategory["IncompatibleWithActionVersion"] = "IncompatibleWithActionVersion";
    CliConfigErrorCategory["InitCalledTwice"] = "InitCalledTwice";
@@ -128,7 +126,6 @@ var CliConfigErrorCategory;
    CliConfigErrorCategory["NoSourceCodeSeen"] = "NoSourceCodeSeen";
    CliConfigErrorCategory["NoSupportedBuildCommandSucceeded"] = "NoSupportedBuildCommandSucceeded";
    CliConfigErrorCategory["NoSupportedBuildSystemDetected"] = "NoSupportedBuildSystemDetected";
-    CliConfigErrorCategory["PackCannotBeFound"] = "PackCannotBeFound";
    CliConfigErrorCategory["SwiftBuildFailed"] = "SwiftBuildFailed";
    CliConfigErrorCategory["UnsupportedBuildMode"] = "UnsupportedBuildMode";
 })(CliConfigErrorCategory || (exports.CliConfigErrorCategory = CliConfigErrorCategory = {}));
@@ -137,14 +134,6 @@ var CliConfigErrorCategory;
 * would like to categorize an error as a configuration error or not.
 */
 exports.cliErrorsConfig = {
-    [CliConfigErrorCategory.ExternalRepositoryCloneFailed]: {
-        cliErrorMessageCandidates: [
-            new RegExp("Failed to clone external Git repository"),
-        ],
-    },
-    [CliConfigErrorCategory.GracefulOutOfMemory]: {
-        cliErrorMessageCandidates: [new RegExp("CodeQL is out of memory.")],
-    },
    [CliConfigErrorCategory.GradleBuildFailed]: {
        cliErrorMessageCandidates: [
            new RegExp("[autobuild] FAILURE: Build failed with an exception."),
@@ -200,11 +189,6 @@ exports.cliErrorsConfig = {
            new RegExp("No supported build system detected"),
        ],
    },
-    [CliConfigErrorCategory.PackCannotBeFound]: {
-        cliErrorMessageCandidates: [
-            new RegExp("Query pack .* cannot be found\\. Check the spelling of the pack\\."),
-        ],
-    },
    [CliConfigErrorCategory.SwiftBuildFailed]: {
        cliErrorMessageCandidates: [
            new RegExp("\\[autobuilder/build\\] \\[build-command-failed\\] `autobuild` failed to run the build command"),
--- a/lib/cli-errors.js.map
+++ b/lib/cli-errors.js.map
--- a/lib/codeql.js
+++ b/lib/codeql.js
@@ -34,9 +34,9 @@ const actions_util_1 = require("./actions-util");
 const cli_errors_1 = require("./cli-errors");
 const environment_1 = require("./environment");
 const feature_flags_1 = require("./feature-flags");
+const languages_1 = require("./languages");
 const setupCodeql = __importStar(require("./setup-codeql"));
 const tools_features_1 = require("./tools-features");
-const tracer_config_1 = require("./tracer-config");
 const util = __importStar(require("./util"));
 const util_1 = require("./util");
 /**
@@ -254,9 +254,9 @@ async function getCodeQLForCmd(cmd, checkVersion) {
        async supportsFeature(feature) {
            return (0, tools_features_1.isSupportedToolsFeature)(await this.getVersion(), feature);
        },
-        async databaseInitCluster(config, sourceRoot, processName, qlconfigFile, features, logger) {
+        async databaseInitCluster(config, sourceRoot, processName, qlconfigFile, logger) {
            const extraArgs = config.languages.map((language) => `--language=${language}`);
-            if (await (0, tracer_config_1.shouldEnableIndirectTracing)(codeql, config, features)) {
+            if (config.languages.filter((l) => (0, languages_1.isTracedLanguage)(l)).length > 0) {
                extraArgs.push("--begin-tracing");
                extraArgs.push(...(await getTrapCachingExtractorConfigArgs(config)));
                extraArgs.push(`--trace-process-name=${processName}`);
@@ -274,13 +274,13 @@ async function getCodeQLForCmd(cmd, checkVersion) {
            if (qlconfigFile !== undefined) {
                extraArgs.push(`--qlconfig-file=${qlconfigFile}`);
            }
-            if (await util.codeQlVersionAtLeast(this, exports.CODEQL_VERSION_LANGUAGE_BASELINE_CONFIG)) {
+            if (await util.codeQlVersionAbove(this, exports.CODEQL_VERSION_LANGUAGE_BASELINE_CONFIG)) {
                extraArgs.push("--calculate-language-specific-baseline");
            }
            if (await isSublanguageFileCoverageEnabled(config, this)) {
                extraArgs.push("--sublanguage-file-coverage");
            }
-            else if (await util.codeQlVersionAtLeast(this, exports.CODEQL_VERSION_SUBLANGUAGE_FILE_COVERAGE)) {
+            else if (await util.codeQlVersionAbove(this, exports.CODEQL_VERSION_SUBLANGUAGE_FILE_COVERAGE)) {
                extraArgs.push("--no-sublanguage-file-coverage");
            }
            await runTool(cmd, [
@@ -292,16 +292,24 @@ async function getCodeQLForCmd(cmd, checkVersion) {
                `--source-root=${sourceRoot}`,
                ...(await getLanguageAliasingArguments(this)),
                ...extraArgs,
-                ...getExtraOptionsFromEnv(["database", "init"], {
-                    ignoringOptions: ["--overwrite"],
-                }),
+                ...getExtraOptionsFromEnv(["database", "init"]),
            ], { stdin: externalRepositoryToken });
        },
-        async runAutobuild(config, language) {
-            applyAutobuildAzurePipelinesTimeoutFix();
+        async runAutobuild(language, enableDebugLogging) {
            const autobuildCmd = path.join(await this.resolveExtractor(language), "tools", process.platform === "win32" ? "autobuild.cmd" : "autobuild.sh");
+            // Update JAVA_TOOL_OPTIONS to contain '-Dhttp.keepAlive=false'
+            // This is because of an issue with Azure pipelines timing out connections after 4 minutes
+            // and Maven not properly handling closed connections
+            // Otherwise long build processes will timeout when pulling down Java packages
+            // https://developercommunity.visualstudio.com/content/problem/292284/maven-hosted-agent-connection-timeout.html
+            const javaToolOptions = process.env["JAVA_TOOL_OPTIONS"] || "";
+            process.env["JAVA_TOOL_OPTIONS"] = [
+                ...javaToolOptions.split(/\s+/),
+                "-Dhttp.keepAlive=false",
+                "-Dmaven.wagon.http.pool=false",
+            ].join(" ");
            // Bump the verbosity of the autobuild command if we're in debug mode
-            if (config.debugMode) {
+            if (enableDebugLogging) {
                process.env[environment_1.EnvVar.CLI_VERBOSITY] =
                    process.env[environment_1.EnvVar.CLI_VERBOSITY] || EXTRACTION_DEBUG_MODE_VERBOSITY;
            }
@@ -332,35 +340,15 @@ async function getCodeQLForCmd(cmd, checkVersion) {
            ]);
        },
        async extractUsingBuildMode(config, language) {
-            if (config.buildMode === util_1.BuildMode.Autobuild) {
-                applyAutobuildAzurePipelinesTimeoutFix();
-            }
-            try {
-                await runTool(cmd, [
-                    "database",
-                    "trace-command",
-                    "--use-build-mode",
-                    ...(await getTrapCachingExtractorConfigArgsForLang(config, language)),
-                    ...getExtractionVerbosityArguments(config.debugMode),
-                    ...getExtraOptionsFromEnv(["database", "trace-command"]),
-                    util.getCodeQLDatabasePath(config, language),
-                ]);
-            }
-            catch (e) {
-                if (config.buildMode === util_1.BuildMode.Autobuild) {
-                    const prefix = "We were unable to automatically build your code. " +
-                        "Please change the build mode for this language to manual and specify build steps " +
-                        "for your project. For more information, see " +
-                        "https://docs.github.com/en/code-security/code-scanning/troubleshooting-code-scanning/automatic-build-failed.";
-                    const ErrorConstructor = e instanceof util.ConfigurationError
-                        ? util.ConfigurationError
-                        : Error;
-                    throw new ErrorConstructor(`${prefix} ${util.wrapError(e).message}`);
-                }
-                else {
-                    throw e;
-                }
-            }
+            await runTool(cmd, [
+                "database",
+                "trace-command",
+                "--use-build-mode",
+                ...(await getTrapCachingExtractorConfigArgsForLang(config, language)),
+                ...getExtractionVerbosityArguments(config.debugMode),
+                ...getExtraOptionsFromEnv(["database", "trace-command"]),
+                util.getCodeQLDatabasePath(config, language),
+            ]);
        },
        async finalizeDatabase(databasePath, threadsFlag, memoryFlag, enableDebugLogging) {
            const args = [
@@ -454,11 +442,9 @@ async function getCodeQLForCmd(cmd, checkVersion) {
                "--expect-discarded-cache",
                "--min-disk-free=1024", // Try to leave at least 1GB free
                "-v",
-                ...getExtraOptionsFromEnv(["database", "run-queries"], {
-                    ignoringOptions: ["--expect-discarded-cache"],
-                }),
+                ...getExtraOptionsFromEnv(["database", "run-queries"]),
            ];
-            if (await util.codeQlVersionAtLeast(this, feature_flags_1.CODEQL_VERSION_FINE_GRAINED_PARALLELISM)) {
+            if (await util.codeQlVersionAbove(this, feature_flags_1.CODEQL_VERSION_FINE_GRAINED_PARALLELISM)) {
                codeqlArgs.push("--intra-layer-parallelism");
            }
            await runTool(cmd, codeqlArgs);
@@ -492,7 +478,7 @@ async function getCodeQLForCmd(cmd, checkVersion) {
            if (await isSublanguageFileCoverageEnabled(config, this)) {
                codeqlArgs.push("--sublanguage-file-coverage");
            }
-            else if (await util.codeQlVersionAtLeast(this, exports.CODEQL_VERSION_SUBLANGUAGE_FILE_COVERAGE)) {
+            else if (await util.codeQlVersionAbove(this, exports.CODEQL_VERSION_SUBLANGUAGE_FILE_COVERAGE)) {
                codeqlArgs.push("--no-sublanguage-file-coverage");
            }
            if (shouldExportDiagnostics) {
@@ -501,7 +487,7 @@ async function getCodeQLForCmd(cmd, checkVersion) {
            else {
                codeqlArgs.push("--no-sarif-include-diagnostics");
            }
-            if ((await util.codeQlVersionAtLeast(this, exports.CODEQL_VERSION_ANALYSIS_SUMMARY_V2)) &&
+            if ((await util.codeQlVersionAbove(this, exports.CODEQL_VERSION_ANALYSIS_SUMMARY_V2)) &&
                !(0, tools_features_1.isSupportedToolsFeature)(await this.getVersion(), tools_features_1.ToolsFeature.AnalysisSummaryV2IsDefault)) {
                codeqlArgs.push("--new-analysis-summary");
            }
@@ -682,12 +668,12 @@ async function getCodeQLForCmd(cmd, checkVersion) {
    // would call getVersion(), so the CLI version would be cached as soon as the
    // CodeQL object is created.
    if (checkVersion &&
-        !(await util.codeQlVersionAtLeast(codeql, CODEQL_MINIMUM_VERSION))) {
+        !(await util.codeQlVersionAbove(codeql, CODEQL_MINIMUM_VERSION))) {
        throw new util.ConfigurationError(`Expected a CodeQL CLI with version at least ${CODEQL_MINIMUM_VERSION} but got version ${(await codeql.getVersion()).version}`);
    }
    else if (checkVersion &&
        process.env[environment_1.EnvVar.SUPPRESS_DEPRECATED_SOON_WARNING] !== "true" &&
-        !(await util.codeQlVersionAtLeast(codeql, CODEQL_NEXT_MINIMUM_VERSION))) {
+        !(await util.codeQlVersionAbove(codeql, CODEQL_NEXT_MINIMUM_VERSION))) {
        const result = await codeql.getVersion();
        core.warning(`CodeQL CLI version ${result.version} was discontinued on ` +
            `${GHES_MOST_RECENT_DEPRECATION_DATE} alongside GitHub Enterprise Server ` +
@@ -706,13 +692,10 @@ async function getCodeQLForCmd(cmd, checkVersion) {
 exports.getCodeQLForCmd = getCodeQLForCmd;
 /**
 * Gets the options for `path` of `options` as an array of extra option strings.
- *
- * @param ignoringOptions Options that should be ignored, for example because they have already
- *                        been passed and it is an error to pass them more than once.
 */
-function getExtraOptionsFromEnv(paths, { ignoringOptions } = {}) {
+function getExtraOptionsFromEnv(paths) {
    const options = util.getExtraOptionsEnvParam();
-    return getExtraOptions(options, paths, []).filter((option) => !ignoringOptions?.includes(option));
+    return getExtraOptions(options, paths, []);
 }
 /**
 * Gets `options` as an array of extra option strings.
@@ -883,10 +866,10 @@ function getGeneratedCodeScanningConfigPath(config) {
 }
 exports.getGeneratedCodeScanningConfigPath = getGeneratedCodeScanningConfigPath;
 async function isDiagnosticsExportInvalidSarifFixed(codeql) {
-    return await util.codeQlVersionAtLeast(codeql, exports.CODEQL_VERSION_DIAGNOSTICS_EXPORT_FIXED);
+    return await util.codeQlVersionAbove(codeql, exports.CODEQL_VERSION_DIAGNOSTICS_EXPORT_FIXED);
 }
 async function getLanguageAliasingArguments(codeql) {
-    if (await util.codeQlVersionAtLeast(codeql, exports.CODEQL_VERSION_LANGUAGE_ALIASING)) {
+    if (await util.codeQlVersionAbove(codeql, exports.CODEQL_VERSION_LANGUAGE_ALIASING)) {
        return ["--extractor-include-aliases"];
    }
    return [];
@@ -896,10 +879,10 @@ async function isSublanguageFileCoverageEnabled(config, codeql) {
    // Sub-language file coverage is first supported in GHES 3.12.
    (config.gitHubVersion.type !== util.GitHubVariant.GHES ||
        semver.gte(config.gitHubVersion.version, "3.12.0")) &&
-        (await util.codeQlVersionAtLeast(codeql, exports.CODEQL_VERSION_SUBLANGUAGE_FILE_COVERAGE)));
+        (await util.codeQlVersionAbove(codeql, exports.CODEQL_VERSION_SUBLANGUAGE_FILE_COVERAGE)));
 }
 async function getCodeScanningQueryHelpArguments(codeql) {
-    if (await util.codeQlVersionAtLeast(codeql, CODEQL_VERSION_INCLUDE_QUERY_HELP)) {
+    if (await util.codeQlVersionAbove(codeql, CODEQL_VERSION_INCLUDE_QUERY_HELP)) {
        return ["--sarif-include-query-help=always"];
    }
    return ["--sarif-add-query-help"];
@@ -909,19 +892,4 @@ function getExtractionVerbosityArguments(enableDebugLogging) {
        ? [`--verbosity=${EXTRACTION_DEBUG_MODE_VERBOSITY}`]
        : [];
 }
-/**
- * Updates the `JAVA_TOOL_OPTIONS` environment variable to resolve an issue with Azure Pipelines
- * timing out connections after 4 minutes and Maven not properly handling closed connections.
- *
- * Without the fix, long build processes will timeout when pulling down Java packages
- * https://developercommunity.visualstudio.com/content/problem/292284/maven-hosted-agent-connection-timeout.html
- */
-function applyAutobuildAzurePipelinesTimeoutFix() {
-    const javaToolOptions = process.env["JAVA_TOOL_OPTIONS"] || "";
-    process.env["JAVA_TOOL_OPTIONS"] = [
-        ...javaToolOptions.split(/\s+/),
-        "-Dhttp.keepAlive=false",
-        "-Dmaven.wagon.http.pool=false",
-    ].join(" ");
-}
 //# sourceMappingURL=codeql.js.map
--- a/lib/codeql.js.map
+++ b/lib/codeql.js.map
--- a/lib/codeql.test.js
+++ b/lib/codeql.test.js
@@ -315,7 +315,7 @@ const injectedConfigMacro = ava_1.default.macro({
                tempDir,
                augmentationProperties,
            };
-            await codeqlObject.databaseInitCluster(thisStubConfig, "", undefined, undefined, (0, testing_utils_1.createFeatures)([]), (0, logging_1.getRunnerLogger)(true));
+            await codeqlObject.databaseInitCluster(thisStubConfig, "", undefined, undefined, (0, logging_1.getRunnerLogger)(true));
            const args = runnerConstructorStub.firstCall.args[1];
            // should have used an config file
            const configArg = args.find((arg) => arg.startsWith("--codescanning-config="));
@@ -451,7 +451,7 @@ const injectedConfigMacro = ava_1.default.macro({
        const runnerConstructorStub = stubToolRunnerConstructor();
        const codeqlObject = await codeql.getCodeQLForTesting();
        sinon.stub(codeqlObject, "getVersion").resolves((0, testing_utils_1.makeVersionInfo)("2.12.6"));
-        await codeqlObject.databaseInitCluster({ ...stubConfig, tempDir }, "", undefined, "/path/to/qlconfig.yml", (0, testing_utils_1.createFeatures)([]), (0, logging_1.getRunnerLogger)(true));
+        await codeqlObject.databaseInitCluster({ ...stubConfig, tempDir }, "", undefined, "/path/to/qlconfig.yml", (0, logging_1.getRunnerLogger)(true));
        const args = runnerConstructorStub.firstCall.args[1];
        // should have used a config file
        const hasCodeScanningConfigArg = args.some((arg) => arg.startsWith("--codescanning-config="));
@@ -467,7 +467,7 @@ const injectedConfigMacro = ava_1.default.macro({
        const codeqlObject = await codeql.getCodeQLForTesting();
        sinon.stub(codeqlObject, "getVersion").resolves((0, testing_utils_1.makeVersionInfo)("2.12.6"));
        await codeqlObject.databaseInitCluster({ ...stubConfig, tempDir }, "", undefined, undefined, // undefined qlconfigFile
-        (0, testing_utils_1.createFeatures)([]), (0, logging_1.getRunnerLogger)(true));
+        (0, logging_1.getRunnerLogger)(true));
        const args = runnerConstructorStub.firstCall.args[1];
        const hasQlconfigArg = args.some((arg) => arg.startsWith("--qlconfig-file="));
        t.false(hasQlconfigArg, "should NOT have injected a qlconfig");
@@ -572,7 +572,7 @@ for (const { codeqlVersion, flagPassed, githubVersion, negativeFlagPassed, } of
    sinon.stub(codeqlObject, "resolveExtractor").resolves("/path/to/extractor");
    // safeWhich throws because of the test CodeQL object.
    sinon.stub(safeWhich, "safeWhich").resolves("");
-    await t.throwsAsync(async () => await codeqlObject.runAutobuild(stubConfig, languages_1.Language.java), {
+    await t.throwsAsync(async () => await codeqlObject.runAutobuild(languages_1.Language.java, false), {
        instanceOf: cli_errors_1.CommandInvocationError,
        message: "We were unable to automatically build your code. Please provide manual build steps. " +
            "For more information, see " +
@@ -591,7 +591,7 @@ for (const { codeqlVersion, flagPassed, githubVersion, negativeFlagPassed, } of
    sinon.stub(codeqlObject, "resolveExtractor").resolves("/path/to/extractor");
    // safeWhich throws because of the test CodeQL object.
    sinon.stub(safeWhich, "safeWhich").resolves("");
-    await t.throwsAsync(async () => await codeqlObject.runAutobuild(stubConfig, languages_1.Language.java), {
+    await t.throwsAsync(async () => await codeqlObject.runAutobuild(languages_1.Language.java, false), {
        instanceOf: cli_errors_1.CommandInvocationError,
        message: "We were unable to automatically build your code. Please provide manual build steps. " +
            "For more information, see " +
@@ -613,24 +613,6 @@ for (const { codeqlVersion, flagPassed, githubVersion, negativeFlagPassed, } of
            "Exit code was 32 and last log line was: line5\\. See the logs for more details\\."),
    });
 });
-(0, ava_1.default)("Avoids duplicating --overwrite flag if specified in CODEQL_ACTION_EXTRA_OPTIONS", async (t) => {
-    const runnerConstructorStub = stubToolRunnerConstructor();
-    const codeqlObject = await codeql.getCodeQLForTesting();
-    sinon.stub(codeqlObject, "getVersion").resolves((0, testing_utils_1.makeVersionInfo)("2.12.6"));
-    // safeWhich throws because of the test CodeQL object.
-    sinon.stub(safeWhich, "safeWhich").resolves("");
-    process.env["CODEQL_ACTION_EXTRA_OPTIONS"] =
-        '{ "database": { "init": ["--overwrite"] } }';
-    await codeqlObject.databaseInitCluster(stubConfig, "sourceRoot", undefined, undefined, (0, testing_utils_1.createFeatures)([]), (0, logging_1.getRunnerLogger)(false));
-    t.true(runnerConstructorStub.calledOnce);
-    const args = runnerConstructorStub.firstCall.args[1];
-    t.is(args.filter((option) => option === "--overwrite").length, 1, "--overwrite should only be passed once");
-    // Clean up
-    const configArg = args.find((arg) => arg.startsWith("--codescanning-config="));
-    t.truthy(configArg, "Should have injected a codescanning config");
-    const configFile = configArg.split("=")[1];
-    await (0, del_1.default)(configFile, { force: true });
-});
 function stubToolRunnerConstructor(exitCode = 0, stderr) {
    const runnerObjectStub = sinon.createStubInstance(toolrunner.ToolRunner);
    const runnerConstructorStub = sinon.stub(toolrunner, "ToolRunner");
--- a/lib/codeql.test.js.map
+++ b/lib/codeql.test.js.map
--- a/lib/config-utils.js
+++ b/lib/config-utils.js
@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseBuildModeInput = exports.wrapEnvironment = exports.generateRegistries = exports.getConfig = exports.getPathToParsedConfigFile = exports.initConfig = exports.validatePackSpecification = exports.parsePacksSpecification = exports.parsePacksFromInput = exports.calculateAugmentation = exports.getDefaultConfig = exports.getRawLanguages = exports.getLanguageAliases = exports.getLanguages = exports.getLanguagesInRepo = exports.getUnknownLanguagesError = exports.getNoLanguagesError = exports.getConfigFileDirectoryGivenMessage = exports.getConfigFileFormatInvalidMessage = exports.getConfigFileRepoFormatInvalidMessage = exports.getConfigFileDoesNotExistErrorMessage = exports.getConfigFileOutsideWorkspaceErrorMessage = exports.getPacksStrInvalid = exports.defaultAugmentationProperties = void 0;
+exports.parseBuildModeInput = exports.wrapEnvironment = exports.generateRegistries = exports.getConfig = exports.getPathToParsedConfigFile = exports.initConfig = exports.validatePackSpecification = exports.parsePacksSpecification = exports.parsePacksFromInput = exports.calculateAugmentation = exports.getDefaultConfig = exports.getRawLanguages = exports.getLanguageAliases = exports.getLanguages = exports.getLanguagesInRepo = exports.getUnknownLanguagesError = exports.getNoLanguagesError = exports.getConfigFileDirectoryGivenMessage = exports.getConfigFileFormatInvalidMessage = exports.getConfigFileRepoFormatInvalidMessage = exports.getConfigFileDoesNotExistErrorMessage = exports.getConfigFileOutsideWorkspaceErrorMessage = exports.getPacksStrInvalid = exports.defaultAugmentationProperties = exports.BuildMode = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const perf_hooks_1 = require("perf_hooks");
@@ -37,6 +37,12 @@ const trap_caching_1 = require("./trap-caching");
 const util_1 = require("./util");
 // Property names from the user-supplied config file.
 const PACKS_PROPERTY = "packs";
+var BuildMode;
+(function (BuildMode) {
+    BuildMode["None"] = "none";
+    BuildMode["Autobuild"] = "autobuild";
+    BuildMode["Manual"] = "manual";
+})(BuildMode || (exports.BuildMode = BuildMode = {}));
 /**
 * The default, empty augmentation properties. This is most useful
 * for tests.
@@ -176,7 +182,7 @@ exports.getLanguages = getLanguages;
 * version of the CLI.
 */
 async function getLanguageAliases(codeql) {
-    if (await (0, util_1.codeQlVersionAtLeast)(codeql, codeql_1.CODEQL_VERSION_LANGUAGE_ALIASING)) {
+    if (await (0, util_1.codeQlVersionAbove)(codeql, codeql_1.CODEQL_VERSION_LANGUAGE_ALIASING)) {
        return (await codeql.betterResolveLanguages()).aliases;
    }
    return undefined;
@@ -671,13 +677,13 @@ async function parseBuildModeInput(input, languages, features, logger) {
    if (input === undefined) {
        return undefined;
    }
-    if (!Object.values(util_1.BuildMode).includes(input)) {
-        throw new util_1.ConfigurationError(`Invalid build mode: '${input}'. Supported build modes are: ${Object.values(util_1.BuildMode).join(", ")}.`);
+    if (!Object.values(BuildMode).includes(input)) {
+        throw new util_1.ConfigurationError(`Invalid build mode: '${input}'. Supported build modes are: ${Object.values(BuildMode).join(", ")}.`);
    }
    if (languages.includes(languages_1.Language.java) &&
        (await features.getValue(feature_flags_1.Feature.DisableJavaBuildlessEnabled))) {
        logger.warning("Scanning Java code without a build is temporarily unavailable. Falling back to 'autobuild' build mode.");
-        return util_1.BuildMode.Autobuild;
+        return BuildMode.Autobuild;
    }
    return input;
 }
--- a/lib/config-utils.js.map
+++ b/lib/config-utils.js.map
--- a/lib/config-utils.test.js
+++ b/lib/config-utils.test.js
@@ -35,6 +35,7 @@ const sinon = __importStar(require("sinon"));
 const api = __importStar(require("./api-client"));
 const codeql_1 = require("./codeql");
 const configUtils = __importStar(require("./config-utils"));
+const config_utils_1 = require("./config-utils");
 const feature_flags_1 = require("./feature-flags");
 const languages_1 = require("./languages");
 const logging_1 = require("./logging");
@@ -268,7 +269,7 @@ function mockListLanguages(languages) {
        // And the config we expect it to parse to
        const expectedConfig = {
            languages: [languages_1.Language.javascript],
-            buildMode: util_1.BuildMode.None,
+            buildMode: config_utils_1.BuildMode.None,
            originalUserInput: {
                name: "my config",
                "disable-default-queries": true,
@@ -767,19 +768,19 @@ const mockRepositoryNwo = (0, repository_1.parseRepositoryNwo)("owner/repo");
 (0, ava_1.default)("Build mode not overridden when disable Java buildless feature flag disabled", async (t) => {
    const messages = [];
    const buildMode = await configUtils.parseBuildModeInput("none", [languages_1.Language.java], (0, testing_utils_1.createFeatures)([]), (0, testing_utils_1.getRecordingLogger)(messages));
-    t.is(buildMode, util_1.BuildMode.None);
+    t.is(buildMode, config_utils_1.BuildMode.None);
    t.deepEqual(messages, []);
 });
 (0, ava_1.default)("Build mode not overridden for other languages", async (t) => {
    const messages = [];
    const buildMode = await configUtils.parseBuildModeInput("none", [languages_1.Language.python], (0, testing_utils_1.createFeatures)([feature_flags_1.Feature.DisableJavaBuildlessEnabled]), (0, testing_utils_1.getRecordingLogger)(messages));
-    t.is(buildMode, util_1.BuildMode.None);
+    t.is(buildMode, config_utils_1.BuildMode.None);
    t.deepEqual(messages, []);
 });
 (0, ava_1.default)("Build mode overridden when analyzing Java and disable Java buildless feature flag enabled", async (t) => {
    const messages = [];
    const buildMode = await configUtils.parseBuildModeInput("none", [languages_1.Language.java], (0, testing_utils_1.createFeatures)([feature_flags_1.Feature.DisableJavaBuildlessEnabled]), (0, testing_utils_1.getRecordingLogger)(messages));
-    t.is(buildMode, util_1.BuildMode.Autobuild);
+    t.is(buildMode, config_utils_1.BuildMode.Autobuild);
    t.deepEqual(messages, [
        {
            message: "Scanning Java code without a build is temporarily unavailable. Falling back to 'autobuild' build mode.",
--- a/lib/config-utils.test.js.map
+++ b/lib/config-utils.test.js.map
--- a/lib/database-upload.js
+++ b/lib/database-upload.js
@@ -36,9 +36,8 @@ async function uploadDatabases(repositoryNwo, config, apiDetails, logger) {
        return;
    }
    // Do nothing when not running against github.com
-    if (config.gitHubVersion.type !== util.GitHubVariant.DOTCOM &&
-        config.gitHubVersion.type !== util.GitHubVariant.GHE_DOTCOM) {
-        logger.debug("Not running against github.com or GHEC-DR. Skipping upload.");
+    if (config.gitHubVersion.type !== util.GitHubVariant.DOTCOM) {
+        logger.debug("Not running against github.com. Skipping upload.");
        return;
    }
    if (!(await actionsUtil.isAnalyzingDefaultBranch())) {
@@ -48,14 +47,6 @@ async function uploadDatabases(repositoryNwo, config, apiDetails, logger) {
    }
    const client = (0, api_client_1.getApiClient)();
    const codeql = await (0, codeql_1.getCodeQL)(config.codeQLCmd);
-    const uploadsUrl = new URL((0, util_1.parseGitHubUrl)(apiDetails.url));
-    uploadsUrl.hostname = `uploads.${uploadsUrl.hostname}`;
-    // Octokit expects the baseUrl to not have a trailing slash,
-    // but it is included by default in a URL.
-    let uploadsBaseUrl = uploadsUrl.toString();
-    if (uploadsBaseUrl.endsWith("/")) {
-        uploadsBaseUrl = uploadsBaseUrl.slice(0, -1);
-    }
    for (const language of config.languages) {
        try {
            // Upload the database bundle.
@@ -67,8 +58,7 @@ async function uploadDatabases(repositoryNwo, config, apiDetails, logger) {
            const bundledDbReadStream = fs.createReadStream(bundledDb);
            const commitOid = await actionsUtil.getCommitOid(actionsUtil.getRequiredInput("checkout_path"));
            try {
-                await client.request(`POST /repos/:owner/:repo/code-scanning/codeql/databases/:language?name=:name&commit_oid=:commit_oid`, {
-                    baseUrl: uploadsBaseUrl,
+                await client.request(`POST https://uploads.github.com/repos/:owner/:repo/code-scanning/codeql/databases/:language?name=:name&commit_oid=:commit_oid`, {
                    owner: repositoryNwo.owner,
                    repo: repositoryNwo.repo,
                    language,
--- a/lib/database-upload.js.map
+++ b/lib/database-upload.js.map
@@ -1 +1 @@
-{"version":3,"file":"database-upload.js","sourceRoot":"","sources":["../src/database-upload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AAEzB,4DAA8C;AAC9C,6CAA8D;AAC9D,qCAAqC;AAIrC,6CAA+B;AAC/B,iCAAkD;AAE3C,KAAK,UAAU,eAAe,CACnC,aAA4B,EAC5B,MAAc,EACd,UAA4B,EAC5B,MAAc;IAEd,IAAI,WAAW,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,KAAK,MAAM,EAAE,CAAC;QAC/D,MAAM,CAAC,KAAK,CAAC,wDAAwD,CAAC,CAAC;QACvE,OAAO;IACT,CAAC;IAED,iDAAiD;IACjD,IACE,MAAM,CAAC,aAAa,CAAC,IAAI,KAAK,IAAI,CAAC,aAAa,CAAC,MAAM;QACvD,MAAM,CAAC,aAAa,CAAC,IAAI,KAAK,IAAI,CAAC,aAAa,CAAC,UAAU,EAC3D,CAAC;QACD,MAAM,CAAC,KAAK,CAAC,6DAA6D,CAAC,CAAC;QAC5E,OAAO;IACT,CAAC;IAED,IAAI,CAAC,CAAC,MAAM,WAAW,CAAC,wBAAwB,EAAE,CAAC,EAAE,CAAC;QACpD,4EAA4E;QAC5E,MAAM,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC;QAC/D,OAAO;IACT,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,yBAAY,GAAE,CAAC;IAC9B,MAAM,MAAM,GAAG,MAAM,IAAA,kBAAS,EAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAEjD,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,IAAA,qBAAc,EAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3D,UAAU,CAAC,QAAQ,GAAG,WAAW,UAAU,CAAC,QAAQ,EAAE,CAAC;IAEvD,4DAA4D;IAC5D,0CAA0C;IAC1C,IAAI,cAAc,GAAG,UAAU,CAAC,QAAQ,EAAE,CAAC;IAC3C,IAAI,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACjC,cAAc,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;QACxC,IAAI,CAAC;YACH,8BAA8B;YAC9B,2EAA2E;YAC3E,8EAA8E;YAC9E,wEAAwE;YACxE,MAAM,SAAS,GAAG,MAAM,IAAA,eAAQ,EAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;YACrE,MAAM,aAAa,GAAG,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC;YAClD,MAAM,mBAAmB,GAAG,EAAE,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;YAC3D,MAAM,SAAS,GAAG,MAAM,WAAW,CAAC,YAAY,CAC9C,WAAW,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAC9C,CAAC;YACF,IAAI,CAAC;gBACH,MAAM,MAAM,CAAC,OAAO,CAClB,qGAAqG,EACrG;oBACE,OAAO,EAAE,cAAc;oBACvB,KAAK,EAAE,aAAa,CAAC,KAAK;oBAC1B,IAAI,EAAE,aAAa,CAAC,IAAI;oBACxB,QAAQ;oBACR,IAAI,EAAE,GAAG,QAAQ,WAAW;oBAC5B,UAAU,EAAE,SAAS;oBACrB,IAAI,EAAE,mBAAmB;oBACzB,OAAO,EAAE;wBACP,aAAa,EAAE,SAAS,UAAU,CAAC,IAAI,EAAE;wBACzC,cAAc,EAAE,iBAAiB;wBACjC,gBAAgB,EAAE,aAAa;qBAChC;iBACF,CACF,CAAC;gBACF,MAAM,CAAC,KAAK,CAAC,sCAAsC,QAAQ,EAAE,CAAC,CAAC;YACjE,CAAC;oBAAS,CAAC;gBACT,mBAAmB,CAAC,KAAK,EAAE,CAAC;YAC9B,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACf,4CAA4C;YAC5C,MAAM,CAAC,OAAO,CAAC,iCAAiC,QAAQ,KAAK,CAAC,EAAE,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;AACH,CAAC;AA/ED,0CA+EC"}
+{"version":3,"file":"database-upload.js","sourceRoot":"","sources":["../src/database-upload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AAEzB,4DAA8C;AAC9C,6CAA8D;AAC9D,qCAAqC;AAIrC,6CAA+B;AAC/B,iCAAkC;AAE3B,KAAK,UAAU,eAAe,CACnC,aAA4B,EAC5B,MAAc,EACd,UAA4B,EAC5B,MAAc;IAEd,IAAI,WAAW,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,KAAK,MAAM,EAAE,CAAC;QAC/D,MAAM,CAAC,KAAK,CAAC,wDAAwD,CAAC,CAAC;QACvE,OAAO;IACT,CAAC;IAED,iDAAiD;IACjD,IAAI,MAAM,CAAC,aAAa,CAAC,IAAI,KAAK,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;QAC5D,MAAM,CAAC,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACjE,OAAO;IACT,CAAC;IAED,IAAI,CAAC,CAAC,MAAM,WAAW,CAAC,wBAAwB,EAAE,CAAC,EAAE,CAAC;QACpD,4EAA4E;QAC5E,MAAM,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC;QAC/D,OAAO;IACT,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,yBAAY,GAAE,CAAC;IAC9B,MAAM,MAAM,GAAG,MAAM,IAAA,kBAAS,EAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAEjD,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;QACxC,IAAI,CAAC;YACH,8BAA8B;YAC9B,2EAA2E;YAC3E,8EAA8E;YAC9E,wEAAwE;YACxE,MAAM,SAAS,GAAG,MAAM,IAAA,eAAQ,EAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;YACrE,MAAM,aAAa,GAAG,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC;YAClD,MAAM,mBAAmB,GAAG,EAAE,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;YAC3D,MAAM,SAAS,GAAG,MAAM,WAAW,CAAC,YAAY,CAC9C,WAAW,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAC9C,CAAC;YACF,IAAI,CAAC;gBACH,MAAM,MAAM,CAAC,OAAO,CAClB,+HAA+H,EAC/H;oBACE,KAAK,EAAE,aAAa,CAAC,KAAK;oBAC1B,IAAI,EAAE,aAAa,CAAC,IAAI;oBACxB,QAAQ;oBACR,IAAI,EAAE,GAAG,QAAQ,WAAW;oBAC5B,UAAU,EAAE,SAAS;oBACrB,IAAI,EAAE,mBAAmB;oBACzB,OAAO,EAAE;wBACP,aAAa,EAAE,SAAS,UAAU,CAAC,IAAI,EAAE;wBACzC,cAAc,EAAE,iBAAiB;wBACjC,gBAAgB,EAAE,aAAa;qBAChC;iBACF,CACF,CAAC;gBACF,MAAM,CAAC,KAAK,CAAC,sCAAsC,QAAQ,EAAE,CAAC,CAAC;YACjE,CAAC;oBAAS,CAAC;gBACT,mBAAmB,CAAC,KAAK,EAAE,CAAC;YAC9B,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACf,4CAA4C;YAC5C,MAAM,CAAC,OAAO,CAAC,iCAAiC,QAAQ,KAAK,CAAC,EAAE,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;AACH,CAAC;AAjED,0CAiEC"}
--- a/lib/database-upload.test.js
+++ b/lib/database-upload.test.js
@@ -57,7 +57,7 @@ async function mockHttpRequests(databaseUploadStatusCode) {
    // Passing an auth token is required, so we just use a dummy value
    const client = github.getOctokit("123");
    const requestSpy = sinon.stub(client, "request");
-    const url = "POST /repos/:owner/:repo/code-scanning/codeql/databases/:language?name=:name&commit_oid=:commit_oid";
+    const url = "POST https://uploads.github.com/repos/:owner/:repo/code-scanning/codeql/databases/:language?name=:name&commit_oid=:commit_oid";
    const databaseUploadSpy = requestSpy.withArgs(url);
    if (databaseUploadStatusCode < 300) {
        databaseUploadSpy.resolves(undefined);
@@ -66,7 +66,6 @@ async function mockHttpRequests(databaseUploadStatusCode) {
        databaseUploadSpy.throws(new util_1.HTTPError("some error message", databaseUploadStatusCode));
    }
    sinon.stub(apiClient, "getApiClient").value(() => client);
-    return databaseUploadSpy;
 }
 (0, ava_1.default)("Abort database upload if 'upload-database' input set to false", async (t) => {
    await (0, util_1.withTmpDir)(async (tmpDir) => {
@@ -96,8 +95,7 @@ async function mockHttpRequests(databaseUploadStatusCode) {
        const loggedMessages = [];
        await (0, database_upload_1.uploadDatabases)(testRepoName, config, testApiDetails, (0, testing_utils_1.getRecordingLogger)(loggedMessages));
        t.assert(loggedMessages.find((v) => v.type === "debug" &&
-            v.message ===
-                "Not running against github.com or GHEC-DR. Skipping upload.") !== undefined);
+            v.message === "Not running against github.com. Skipping upload.") !== undefined);
    });
 });
 (0, ava_1.default)("Abort database upload if not analyzing default branch", async (t) => {
@@ -135,7 +133,7 @@ async function mockHttpRequests(databaseUploadStatusCode) {
                "Failed to upload database for javascript: Error: some error message") !== undefined);
    });
 });
-(0, ava_1.default)("Successfully uploading a database to github.com", async (t) => {
+(0, ava_1.default)("Successfully uploading a database to api.github.com", async (t) => {
    await (0, util_1.withTmpDir)(async (tmpDir) => {
        (0, testing_utils_1.setupActionsVars)(tmpDir, tmpDir);
        sinon
@@ -155,7 +153,7 @@ async function mockHttpRequests(databaseUploadStatusCode) {
            v.message === "Successfully uploaded database for javascript") !== undefined);
    });
 });
-(0, ava_1.default)("Successfully uploading a database to GHEC-DR", async (t) => {
+(0, ava_1.default)("Successfully uploading a database to uploads.github.com", async (t) => {
    await (0, util_1.withTmpDir)(async (tmpDir) => {
        (0, testing_utils_1.setupActionsVars)(tmpDir, tmpDir);
        sinon
@@ -163,21 +161,16 @@ async function mockHttpRequests(databaseUploadStatusCode) {
            .withArgs("upload-database")
            .returns("true");
        sinon.stub(actionsUtil, "isAnalyzingDefaultBranch").resolves(true);
-        const databaseUploadSpy = await mockHttpRequests(201);
+        await mockHttpRequests(201);
        (0, codeql_1.setCodeQL)({
            async databaseBundle(_, outputFilePath) {
                fs.writeFileSync(outputFilePath, "");
            },
        });
        const loggedMessages = [];
-        await (0, database_upload_1.uploadDatabases)(testRepoName, getTestConfig(tmpDir), {
-            auth: "1234",
-            url: "https://tenant.ghe.com",
-            apiURL: undefined,
-        }, (0, testing_utils_1.getRecordingLogger)(loggedMessages));
+        await (0, database_upload_1.uploadDatabases)(testRepoName, getTestConfig(tmpDir), testApiDetails, (0, testing_utils_1.getRecordingLogger)(loggedMessages));
        t.assert(loggedMessages.find((v) => v.type === "debug" &&
            v.message === "Successfully uploaded database for javascript") !== undefined);
-        t.assert(databaseUploadSpy.calledOnceWith(sinon.match.string, sinon.match.has("baseUrl", "https://uploads.tenant.ghe.com")));
    });
 });
 //# sourceMappingURL=database-upload.test.js.map
--- a/lib/database-upload.test.js.map
+++ b/lib/database-upload.test.js.map
--- a/lib/defaults.json
+++ b/lib/defaults.json
@@ -1,6 +1,6 @@
 {
-    "bundleVersion": "codeql-bundle-v2.17.3",
-    "cliVersion": "2.17.3",
-    "priorBundleVersion": "codeql-bundle-v2.17.2",
-    "priorCliVersion": "2.17.2"
+    "bundleVersion": "codeql-bundle-v2.17.0",
+    "cliVersion": "2.17.0",
+    "priorBundleVersion": "codeql-bundle-v2.16.5",
+    "priorCliVersion": "2.16.5"
 }
--- a/lib/feature-flags.js
+++ b/lib/feature-flags.js
@@ -45,11 +45,12 @@ exports.CODEQL_VERSION_FINE_GRAINED_PARALLELISM = "2.15.1";
 /**
 * Feature enablement as returned by the GitHub API endpoint.
 *
- * Legacy features should end with `_enabled`.
+ * Each value of this enum should end with `_enabled`.
 */
 var Feature;
 (function (Feature) {
-    Feature["AutobuildDirectTracing"] = "autobuild_direct_tracing";
+    Feature["AutobuildDirectTracingEnabled"] = "autobuild_direct_tracing_enabled";
+    Feature["CliSarifMerge"] = "cli_sarif_merge_enabled";
    Feature["CppDependencyInstallation"] = "cpp_dependency_installation_enabled";
    Feature["CppTrapCachingEnabled"] = "cpp_trap_caching_enabled";
    Feature["DisableJavaBuildlessEnabled"] = "disable_java_buildless_enabled";
@@ -58,47 +59,47 @@ var Feature;
    Feature["QaTelemetryEnabled"] = "qa_telemetry_enabled";
 })(Feature || (exports.Feature = Feature = {}));
 exports.featureConfig = {
-    [Feature.AutobuildDirectTracing]: {
-        defaultValue: false,
+    [Feature.AutobuildDirectTracingEnabled]: {
        envVar: "CODEQL_ACTION_AUTOBUILD_BUILD_MODE_DIRECT_TRACING",
        minimumVersion: undefined,
        toolsFeature: tools_features_1.ToolsFeature.TraceCommandUseBuildMode,
+        defaultValue: false,
+    },
+    [Feature.CliSarifMerge]: {
+        envVar: "CODEQL_ACTION_CLI_SARIF_MERGE",
+        // This is guarded by a `supportsFeature` check rather than by a version check.
+        minimumVersion: undefined,
+        defaultValue: false,
    },
    [Feature.CppDependencyInstallation]: {
-        defaultValue: false,
        envVar: "CODEQL_EXTRACTOR_CPP_AUTOINSTALL_DEPENDENCIES",
-        legacyApi: true,
        minimumVersion: "2.15.0",
+        defaultValue: false,
    },
    [Feature.CppTrapCachingEnabled]: {
-        defaultValue: false,
        envVar: "CODEQL_CPP_TRAP_CACHING",
-        legacyApi: true,
        minimumVersion: "2.16.1",
+        defaultValue: false,
    },
    [Feature.DisableJavaBuildlessEnabled]: {
-        defaultValue: false,
        envVar: "CODEQL_ACTION_DISABLE_JAVA_BUILDLESS",
-        legacyApi: true,
        minimumVersion: undefined,
+        defaultValue: false,
    },
    [Feature.DisableKotlinAnalysisEnabled]: {
-        defaultValue: false,
        envVar: "CODEQL_DISABLE_KOTLIN_ANALYSIS",
-        legacyApi: true,
        minimumVersion: undefined,
+        defaultValue: false,
    },
    [Feature.ExportDiagnosticsEnabled]: {
-        defaultValue: true,
        envVar: "CODEQL_ACTION_EXPORT_DIAGNOSTICS",
-        legacyApi: true,
        minimumVersion: undefined,
+        defaultValue: true,
    },
    [Feature.QaTelemetryEnabled]: {
-        defaultValue: false,
        envVar: "CODEQL_ACTION_QA_TELEMETRY",
-        legacyApi: true,
        minimumVersion: undefined,
+        defaultValue: false,
    },
 };
 exports.FEATURE_FLAGS_FILE_NAME = "cached-feature-flags.json";
@@ -143,7 +144,7 @@ class Features {
        // Never use this feature if the CLI version explicitly can't support it.
        const minimumVersion = exports.featureConfig[feature].minimumVersion;
        if (codeql && minimumVersion) {
-            if (!(await util.codeQlVersionAtLeast(codeql, minimumVersion))) {
+            if (!(await util.codeQlVersionAbove(codeql, minimumVersion))) {
                this.logger.debug(`Feature ${feature} is disabled because the CodeQL CLI version is older than the minimum ` +
                    `version ${minimumVersion}.`);
                return false;
@@ -314,20 +315,13 @@ class GitHubFeatureFlags {
            return {};
        }
        try {
-            const featuresToRequest = Object.entries(exports.featureConfig)
-                .filter(([, config]) => !config.legacyApi)
-                .map(([f]) => f)
-                .join(",");
            const response = await (0, api_client_1.getApiClient)().request("GET /repos/:owner/:repo/code-scanning/codeql-action/features", {
                owner: this.repositoryNwo.owner,
                repo: this.repositoryNwo.repo,
-                features: featuresToRequest,
            });
            const remoteFlags = response.data;
-            this.logger.debug("Loaded the following default values for the feature flags from the Code Scanning API:");
-            for (const [feature, value] of Object.entries(remoteFlags).sort(([nameA], [nameB]) => nameA.localeCompare(nameB))) {
-                this.logger.debug(`  ${feature}: ${value}`);
-            }
+            this.logger.debug("Loaded the following default values for the feature flags from the Code Scanning API: " +
+                `${JSON.stringify(remoteFlags)}`);
            this.hasAccessedRemoteFeatureFlags = true;
            return remoteFlags;
        }
--- a/lib/feature-flags.js.map
+++ b/lib/feature-flags.js.map
--- a/lib/feature-flags.test.js
+++ b/lib/feature-flags.test.js
@@ -331,18 +331,9 @@ for (const feature of Object.keys(feature_flags_1.featureConfig)) {
                "Ignoring feature flag default_codeql_version_2_20_invalid_enabled as it does not specify a valid CodeQL version.") !== undefined);
    });
 });
-(0, ava_1.default)("legacy feature flags should end with _enabled", async (t) => {
-    for (const [feature, config] of Object.entries(feature_flags_1.featureConfig)) {
-        if (config.legacyApi) {
-            t.assert(feature.endsWith("_enabled"), `legacy feature ${feature} should end with '_enabled'`);
-        }
-    }
-});
-(0, ava_1.default)("non-legacy feature flags should not end with _enabled", async (t) => {
-    for (const [feature, config] of Object.entries(feature_flags_1.featureConfig)) {
-        if (!config.legacyApi) {
-            t.false(feature.endsWith("_enabled"), `non-legacy feature ${feature} should not end with '_enabled'`);
-        }
+(0, ava_1.default)("feature flags should end with _enabled", async (t) => {
+    for (const feature of Object.values(feature_flags_1.Feature)) {
+        t.assert(feature.endsWith("_enabled"), `${feature} should end with '_enabled'`);
    }
 });
 function assertAllFeaturesUndefinedInApi(t, loggedMessages) {
--- a/lib/feature-flags.test.js.map
+++ b/lib/feature-flags.test.js.map
--- a/lib/init-action.js
+++ b/lib/init-action.js
@@ -250,14 +250,14 @@ async function run() {
            core.exportVariable("CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN", "true");
        }
        const kotlinLimitVar = "CODEQL_EXTRACTOR_KOTLIN_OVERRIDE_MAXIMUM_VERSION_LIMIT";
-        if ((await (0, util_1.codeQlVersionAtLeast)(codeql, "2.13.4")) &&
-            !(await (0, util_1.codeQlVersionAtLeast)(codeql, "2.14.4"))) {
+        if ((await (0, util_1.codeQlVersionAbove)(codeql, "2.13.4")) &&
+            !(await (0, util_1.codeQlVersionAbove)(codeql, "2.14.4"))) {
            core.exportVariable(kotlinLimitVar, "1.9.20");
        }
        if (config.languages.includes(languages_1.Language.java) &&
            // Java Lombok support is enabled by default for >= 2.14.4
-            (await (0, util_1.codeQlVersionAtLeast)(codeql, "2.14.0")) &&
-            !(await (0, util_1.codeQlVersionAtLeast)(codeql, "2.14.4"))) {
+            (await (0, util_1.codeQlVersionAbove)(codeql, "2.14.0")) &&
+            !(await (0, util_1.codeQlVersionAbove)(codeql, "2.14.4"))) {
            const envVar = "CODEQL_EXTRACTOR_JAVA_RUN_ANNOTATION_PROCESSORS";
            if (process.env[envVar]) {
                logger.info(`Environment variable ${envVar} already set. Not en/disabling CodeQL Java Lombok support`);
@@ -282,25 +282,17 @@ async function run() {
                core.exportVariable(envVar, "false");
            }
        }
-        // For CLI versions <2.15.1, build tracing caused errors in MacOS ARM machines with
-        // System Integrity Protection (SIP) disabled.
-        if (!(await (0, util_1.codeQlVersionAtLeast)(codeql, "2.15.1")) &&
-            process.platform === "darwin" &&
-            (process.arch === "arm" || process.arch === "arm64") &&
-            !(await (0, init_1.isSipEnabled)(logger))) {
-            logger.warning("CodeQL versions 2.15.0 and lower are not supported on MacOS ARM machines with System Integrity Protection (SIP) disabled.");
-        }
        // From 2.16.0 the default for the python extractor is to not perform any
        // dependency extraction. For versions before that, you needed to set this flag to
        // enable this behavior (supported since 2.13.1).
-        if (await (0, util_1.codeQlVersionAtLeast)(codeql, "2.17.1")) {
+        if (await (0, util_1.codeQlVersionAbove)(codeql, "2.17.1")) {
            // disabled by default, no warning
        }
-        else if (await (0, util_1.codeQlVersionAtLeast)(codeql, "2.16.0")) {
+        else if (await (0, util_1.codeQlVersionAbove)(codeql, "2.16.0")) {
            // disabled by default, prints warning if environment variable is not set
            core.exportVariable("CODEQL_EXTRACTOR_PYTHON_DISABLE_LIBRARY_EXTRACTION", "true");
        }
-        else if (await (0, util_1.codeQlVersionAtLeast)(codeql, "2.13.1")) {
+        else if (await (0, util_1.codeQlVersionAbove)(codeql, "2.13.1")) {
            core.exportVariable("CODEQL_EXTRACTOR_PYTHON_DISABLE_LIBRARY_EXTRACTION", "true");
        }
        else {
@@ -314,7 +306,7 @@ async function run() {
            logger.warning("The CODEQL_ACTION_DISABLE_PYTHON_DEPENDENCY_INSTALLATION environment variable is deprecated and no longer has any effect. We recommend removing any references from your workflows. See https://github.blog/changelog/2024-01-23-codeql-2-16-python-dependency-installation-disabled-new-queries-and-bug-fixes/ for more information.");
        }
        const sourceRoot = path.resolve((0, util_1.getRequiredEnvParam)("GITHUB_WORKSPACE"), (0, actions_util_1.getOptionalInput)("source-root") || "");
-        const tracerConfig = await (0, init_1.runInit)(codeql, config, sourceRoot, "Runner.Worker.exe", (0, actions_util_1.getOptionalInput)("registries"), apiDetails, features, logger);
+        const tracerConfig = await (0, init_1.runInit)(codeql, config, sourceRoot, "Runner.Worker.exe", (0, actions_util_1.getOptionalInput)("registries"), apiDetails, logger);
        if (tracerConfig !== undefined) {
            for (const [key, value] of Object.entries(tracerConfig.env)) {
                core.exportVariable(key, value);
--- a/lib/init-action.js.map
+++ b/lib/init-action.js.map
--- a/lib/init.js
+++ b/lib/init.js
@@ -23,10 +23,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSipEnabled = exports.checkInstallPython311 = exports.printPathFiltersWarning = exports.runInit = exports.initConfig = exports.initCodeQL = void 0;
+exports.checkInstallPython311 = exports.printPathFiltersWarning = exports.runInit = exports.initConfig = exports.initCodeQL = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const exec = __importStar(require("@actions/exec/lib/exec"));
 const toolrunner = __importStar(require("@actions/exec/lib/toolrunner"));
 const safeWhich = __importStar(require("@chrisgavin/safe-which"));
 const codeql_1 = require("./codeql");
@@ -53,7 +52,7 @@ async function initConfig(inputs, codeql) {
    return config;
 }
 exports.initConfig = initConfig;
-async function runInit(codeql, config, sourceRoot, processName, registriesInput, apiDetails, features, logger) {
+async function runInit(codeql, config, sourceRoot, processName, registriesInput, apiDetails, logger) {
    fs.mkdirSync(config.dbLocation, { recursive: true });
    const { registriesAuthTokens, qlconfigFile } = await configUtils.generateRegistries(registriesInput, config.tempDir, logger);
    await configUtils.wrapEnvironment({
@@ -61,8 +60,8 @@ async function runInit(codeql, config, sourceRoot, processName, registriesInput,
        CODEQL_REGISTRIES_AUTH: registriesAuthTokens,
    }, 
    // Init a database cluster
-    async () => await codeql.databaseInitCluster(config, sourceRoot, processName, qlconfigFile, features, logger));
-    return await (0, tracer_config_1.getCombinedTracerConfig)(codeql, config, features);
+    async () => await codeql.databaseInitCluster(config, sourceRoot, processName, qlconfigFile, logger));
+    return await (0, tracer_config_1.getCombinedTracerConfig)(codeql, config);
 }
 exports.runInit = runInit;
 function printPathFiltersWarning(config, logger) {
@@ -90,25 +89,4 @@ async function checkInstallPython311(languages, codeql) {
    }
 }
 exports.checkInstallPython311 = checkInstallPython311;
-// For MacOS runners: runs `csrutil status` to determine whether System
-// Integrity Protection is enabled.
-async function isSipEnabled(logger) {
-    try {
-        const sipStatusOutput = await exec.getExecOutput("csrutil status");
-        if (sipStatusOutput.exitCode === 0) {
-            if (sipStatusOutput.stdout.includes("System Integrity Protection status: enabled.")) {
-                return true;
-            }
-            if (sipStatusOutput.stdout.includes("System Integrity Protection status: disabled.")) {
-                return false;
-            }
-        }
-        return undefined;
-    }
-    catch (e) {
-        logger.warning(`Failed to determine if System Integrity Protection was enabled: ${e}`);
-        return undefined;
-    }
-}
-exports.isSipEnabled = isSipEnabled;
 //# sourceMappingURL=init.js.map
--- a/lib/init.js.map
+++ b/lib/init.js.map
@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"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"}
--- a/lib/resolve-environment.js
+++ b/lib/resolve-environment.js
@@ -33,7 +33,7 @@ async function runResolveBuildEnvironment(cmd, logger, workingDir, languageInput
    let language = languageInput;
    // If the CodeQL CLI version in use supports language aliasing, give the CLI the raw language
    // input. Otherwise, parse the language input and give the CLI the parsed language.
-    if (!(await util.codeQlVersionAtLeast(codeql, codeql_1.CODEQL_VERSION_LANGUAGE_ALIASING))) {
+    if (!(await util.codeQlVersionAbove(codeql, codeql_1.CODEQL_VERSION_LANGUAGE_ALIASING))) {
        const parsedLanguage = (0, languages_1.parseLanguage)(languageInput)?.toString();
        if (parsedLanguage === undefined) {
            throw new util.ConfigurationError(`Did not recognize the language '${languageInput}'.`);
@@ -43,7 +43,7 @@ async function runResolveBuildEnvironment(cmd, logger, workingDir, languageInput
    let result = {};
    // If the CodeQL version in use does not support the `resolve build-environment`
    // command, just return an empty configuration. Otherwise invoke the CLI.
-    if (!(await util.codeQlVersionAtLeast(codeql, codeql_1.CODEQL_VERSION_RESOLVE_ENVIRONMENT))) {
+    if (!(await util.codeQlVersionAbove(codeql, codeql_1.CODEQL_VERSION_RESOLVE_ENVIRONMENT))) {
        logger.warning("Unsupported CodeQL CLI version for `resolve build-environment` command, " +
            "returning an empty configuration.");
    }
--- a/lib/resolve-environment.js.map
+++ b/lib/resolve-environment.js.map
@@ -1 +1 @@
-{"version":3,"file":"resolve-environment.js","sourceRoot":"","sources":["../src/resolve-environment.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qCAIkB;AAClB,2CAA4C;AAE5C,6CAA+B;AAExB,KAAK,UAAU,0BAA0B,CAC9C,GAAW,EACX,MAAc,EACd,UAA8B,EAC9B,aAAqB;IAErB,MAAM,CAAC,UAAU,CACf,+CAA+C,aAAa,EAAE,CAC/D,CAAC;IAEF,MAAM,MAAM,GAAG,MAAM,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC;IAEpC,IAAI,QAAQ,GAAG,aAAa,CAAC;IAC7B,6FAA6F;IAC7F,mFAAmF;IACnF,IACE,CAAC,CAAC,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,yCAAgC,CAAC,CAAC,EAC5E,CAAC;QACD,MAAM,cAAc,GAAG,IAAA,yBAAa,EAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,CAAC;QAChE,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;YACjC,MAAM,IAAI,IAAI,CAAC,kBAAkB,CAC/B,mCAAmC,aAAa,IAAI,CACrD,CAAC;QACJ,CAAC;QACD,QAAQ,GAAG,cAAc,CAAC;IAC5B,CAAC;IAED,IAAI,MAAM,GAAG,EAAE,CAAC;IAEhB,gFAAgF;IAChF,yEAAyE;IACzE,IACE,CAAC,CAAC,MAAM,IAAI,CAAC,oBAAoB,CAC/B,MAAM,EACN,2CAAkC,CACnC,CAAC,EACF,CAAC;QACD,MAAM,CAAC,OAAO,CACZ,0EAA0E;YACxE,mCAAmC,CACtC,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7B,MAAM,CAAC,IAAI,CAAC,SAAS,UAAU,4BAA4B,CAAC,CAAC;QAC/D,CAAC;QAED,MAAM,GAAG,MAAM,MAAM,CAAC,uBAAuB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IACtE,CAAC;IAED,MAAM,CAAC,QAAQ,EAAE,CAAC;IAClB,OAAO,MAAM,CAAC;AAChB,CAAC;AAnDD,gEAmDC"}
+{"version":3,"file":"resolve-environment.js","sourceRoot":"","sources":["../src/resolve-environment.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qCAIkB;AAClB,2CAA4C;AAE5C,6CAA+B;AAExB,KAAK,UAAU,0BAA0B,CAC9C,GAAW,EACX,MAAc,EACd,UAA8B,EAC9B,aAAqB;IAErB,MAAM,CAAC,UAAU,CACf,+CAA+C,aAAa,EAAE,CAC/D,CAAC;IAEF,MAAM,MAAM,GAAG,MAAM,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC;IAEpC,IAAI,QAAQ,GAAG,aAAa,CAAC;IAC7B,6FAA6F;IAC7F,mFAAmF;IACnF,IACE,CAAC,CAAC,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,yCAAgC,CAAC,CAAC,EAC1E,CAAC;QACD,MAAM,cAAc,GAAG,IAAA,yBAAa,EAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,CAAC;QAChE,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;YACjC,MAAM,IAAI,IAAI,CAAC,kBAAkB,CAC/B,mCAAmC,aAAa,IAAI,CACrD,CAAC;QACJ,CAAC;QACD,QAAQ,GAAG,cAAc,CAAC;IAC5B,CAAC;IAED,IAAI,MAAM,GAAG,EAAE,CAAC;IAEhB,gFAAgF;IAChF,yEAAyE;IACzE,IACE,CAAC,CAAC,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,2CAAkC,CAAC,CAAC,EAC5E,CAAC;QACD,MAAM,CAAC,OAAO,CACZ,0EAA0E;YACxE,mCAAmC,CACtC,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7B,MAAM,CAAC,IAAI,CAAC,SAAS,UAAU,4BAA4B,CAAC,CAAC;QAC/D,CAAC;QAED,MAAM,GAAG,MAAM,MAAM,CAAC,uBAAuB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IACtE,CAAC;IAED,MAAM,CAAC,QAAQ,EAAE,CAAC;IAClB,OAAO,MAAM,CAAC;AAChB,CAAC;AAhDD,gEAgDC"}
--- a/lib/setup-codeql.js
+++ b/lib/setup-codeql.js
@@ -52,7 +52,6 @@ var ToolsSource;
    ToolsSource["Download"] = "DOWNLOAD";
 })(ToolsSource || (exports.ToolsSource = ToolsSource = {}));
 exports.CODEQL_DEFAULT_ACTION_REPOSITORY = "github/codeql-action";
-const CODEQL_BUNDLE_VERSION_ALIAS = ["linked", "latest"];
 function getCodeQLBundleName() {
    let platform;
    if (process.platform === "win32") {
@@ -223,10 +222,7 @@ async function findOverridingToolsInCache(humanReadableVersion, logger) {
    return undefined;
 }
 async function getCodeQLSource(toolsInput, defaultCliVersion, apiDetails, variant, logger) {
-    if (toolsInput &&
-        !CODEQL_BUNDLE_VERSION_ALIAS.includes(toolsInput) &&
-        !toolsInput.startsWith("http")) {
-        logger.info(`Using CodeQL CLI from local path ${toolsInput}`);
+    if (toolsInput && toolsInput !== "latest" && !toolsInput.startsWith("http")) {
        return {
            codeqlTarPath: toolsInput,
            sourceType: "local",
@@ -236,21 +232,14 @@ async function getCodeQLSource(toolsInput, defaultCliVersion, apiDetails, varian
    /**
     * Whether the tools shipped with the Action, i.e. those in `defaults.json`, have been forced.
     *
-     * We use the special value of 'linked' to prioritize the version in `defaults.json` over the
+     * We use the special value of 'latest' to prioritize the version in `defaults.json` over the
     * version specified by the feature flags on Dotcom and over any pinned cached version on
     * Enterprise Server.
-     *
-     * Previously we have been using 'latest' to force the shipped tools, but this was not clear
-     * enough for the users, so it has been changed to `linked`. We're keeping around `latest` for
-     * backwards compatibility.
     */
-    const forceShippedTools = toolsInput && CODEQL_BUNDLE_VERSION_ALIAS.includes(toolsInput);
+    const forceShippedTools = toolsInput === "latest";
    if (forceShippedTools) {
-        logger.info(`Overriding the version of the CodeQL tools by ${defaultCliVersion.cliVersion}, the version shipped with the Action since ` +
-            `tools: ${toolsInput} was requested.`);
-        if (toolsInput === "latest") {
-            logger.warning("`tools: latest` has been renamed to `tools: linked`, but the old name is still supported for now. No action is required.");
-        }
+        logger.info("Overriding the version of the CodeQL tools by the version shipped with the Action since " +
+            `"tools: latest" was requested.`);
    }
    /** CLI version number, for example 2.12.6. */
    let cliVersion;
@@ -340,12 +329,6 @@ async function getCodeQLSource(toolsInput, defaultCliVersion, apiDetails, varian
        logger.info(`Did not find CodeQL tools version ${humanReadableVersion} in the toolcache.`);
    }
    if (codeqlFolder) {
-        if (cliVersion) {
-            logger.info(`Using CodeQL CLI version ${cliVersion} from toolcache at ${codeqlFolder}`);
-        }
-        else {
-            logger.info(`Using CodeQL CLI from toolcache at ${codeqlFolder}`);
-        }
        return {
            codeqlFolder,
            sourceType: "toolcache",
@@ -366,12 +349,6 @@ async function getCodeQLSource(toolsInput, defaultCliVersion, apiDetails, varian
    if (!url) {
        url = await getCodeQLBundleDownloadURL(tagName, apiDetails, logger);
    }
-    if (cliVersion) {
-        logger.info(`Using CodeQL CLI version ${cliVersion} sourced from ${url}.`);
-    }
-    else {
-        logger.info(`Using CodeQL CLI sourced from ${url}.`);
-    }
    return {
        bundleVersion: tagName && tryGetBundleVersionFromTagName(tagName, logger),
        cliVersion,
@@ -396,9 +373,7 @@ async function tryGetFallbackToolcacheVersion(cliVersion, tagName, logger) {
    return fallbackVersion;
 }
 exports.tryGetFallbackToolcacheVersion = tryGetFallbackToolcacheVersion;
-// Exported using `export const` for testing purposes. Specifically, we want to
-// be able to stub this function and have other functions in this file use that stub.
-const downloadCodeQL = async function (codeqlURL, maybeBundleVersion, maybeCliVersion, apiDetails, variant, tempDir, logger) {
+async function downloadCodeQL(codeqlURL, maybeBundleVersion, maybeCliVersion, apiDetails, variant, tempDir, logger) {
    const parsedCodeQLURL = new URL(codeqlURL);
    const searchParams = new URLSearchParams(parsedCodeQLURL.search);
    const headers = {
@@ -461,7 +436,7 @@ const downloadCodeQL = async function (codeqlURL, maybeBundleVersion, maybeCliVe
        codeqlFolder: toolcachedBundlePath,
        toolsDownloadDurationMs,
    };
-};
+}
 exports.downloadCodeQL = downloadCodeQL;
 function getCodeQLURLVersion(url) {
    const match = url.match(/\/codeql-bundle-(.*)\//);
@@ -528,7 +503,7 @@ async function setupCodeQLBundle(toolsInput, apiDetails, tempDir, variant, defau
            toolsSource = ToolsSource.Toolcache;
            break;
        case "download": {
-            const result = await (0, exports.downloadCodeQL)(source.codeqlURL, source.bundleVersion, source.cliVersion, apiDetails, variant, tempDir, logger);
+            const result = await downloadCodeQL(source.codeqlURL, source.bundleVersion, source.cliVersion, apiDetails, variant, tempDir, logger);
            toolsVersion = result.toolsVersion;
            codeqlFolder = result.codeqlFolder;
            toolsDownloadDurationMs = result.toolsDownloadDurationMs;
--- a/lib/setup-codeql.js.map
+++ b/lib/setup-codeql.js.map
--- a/lib/setup-codeql.test.js
+++ b/lib/setup-codeql.test.js
@@ -84,74 +84,4 @@ ava_1.default.beforeEach(() => {
        t.is(source["cliVersion"], "1.2.3");
    });
 });
-(0, ava_1.default)("getCodeQLSource correctly returns bundled CLI version when tools == linked", async (t) => {
-    await (0, util_1.withTmpDir)(async (tmpDir) => {
-        (0, testing_utils_1.setupActionsVars)(tmpDir, tmpDir);
-        const source = await setupCodeql.getCodeQLSource("linked", testing_utils_1.SAMPLE_DEFAULT_CLI_VERSION, testing_utils_1.SAMPLE_DOTCOM_API_DETAILS, util_1.GitHubVariant.DOTCOM, (0, logging_1.getRunnerLogger)(true));
-        t.is(source.toolsVersion, testing_utils_1.LINKED_CLI_VERSION.cliVersion);
-        t.is(source.sourceType, "download");
-    });
-});
-(0, ava_1.default)("getCodeQLSource correctly returns bundled CLI version when tools == latest", async (t) => {
-    const loggedMessages = [];
-    const logger = (0, testing_utils_1.getRecordingLogger)(loggedMessages);
-    await (0, util_1.withTmpDir)(async (tmpDir) => {
-        (0, testing_utils_1.setupActionsVars)(tmpDir, tmpDir);
-        const source = await setupCodeql.getCodeQLSource("latest", testing_utils_1.SAMPLE_DEFAULT_CLI_VERSION, testing_utils_1.SAMPLE_DOTCOM_API_DETAILS, util_1.GitHubVariant.DOTCOM, logger);
-        // First, ensure that the CLI version is the linked version, so that backwards
-        // compatibility is maintained.
-        t.is(source.toolsVersion, testing_utils_1.LINKED_CLI_VERSION.cliVersion);
-        t.is(source.sourceType, "download");
-        // Afterwards, ensure that we see the deprecation message in the log.
-        const expected_message = "`tools: latest` has been renamed to `tools: linked`, but the old name is still supported for now. No action is required.";
-        t.assert(loggedMessages.some((msg) => typeof msg.message === "string" &&
-            msg.message.includes(expected_message)));
-    });
-});
-(0, ava_1.default)("setupCodeQLBundle logs the CodeQL CLI version being used when asked to use linked tools", async (t) => {
-    const loggedMessages = [];
-    const logger = (0, testing_utils_1.getRecordingLogger)(loggedMessages);
-    // Stub the downloadCodeQL function to prevent downloading artefacts
-    // during testing from being called.
-    sinon.stub(setupCodeql, "downloadCodeQL").resolves({
-        toolsVersion: testing_utils_1.LINKED_CLI_VERSION.cliVersion,
-        codeqlFolder: "codeql",
-        toolsDownloadDurationMs: 200,
-    });
-    await (0, util_1.withTmpDir)(async (tmpDir) => {
-        (0, testing_utils_1.setupActionsVars)(tmpDir, tmpDir);
-        const result = await setupCodeql.setupCodeQLBundle("linked", testing_utils_1.SAMPLE_DOTCOM_API_DETAILS, "tmp/codeql_action_test/", util_1.GitHubVariant.DOTCOM, testing_utils_1.SAMPLE_DEFAULT_CLI_VERSION, logger);
-        // Basic sanity check that the version we got back is indeed
-        // the linked (default) CLI version.
-        t.is(result.toolsVersion, testing_utils_1.LINKED_CLI_VERSION.cliVersion);
-        // Ensure message logging CodeQL CLI version was present in user logs.
-        const expected_message = `Using CodeQL CLI version ${testing_utils_1.LINKED_CLI_VERSION.cliVersion}`;
-        t.assert(loggedMessages.some((msg) => typeof msg.message === "string" &&
-            msg.message.includes(expected_message)));
-    });
-});
-(0, ava_1.default)("setupCodeQLBundle logs the CodeQL CLI version being used when asked to download a non-default bundle", async (t) => {
-    const loggedMessages = [];
-    const logger = (0, testing_utils_1.getRecordingLogger)(loggedMessages);
-    const bundleUrl = "https://github.com/github/codeql-action/releases/download/codeql-bundle-v2.16.0/codeql-bundle-linux64.tar.gz";
-    const expectedVersion = "2.16.0";
-    // Stub the downloadCodeQL function to prevent downloading artefacts
-    // during testing from being called.
-    sinon.stub(setupCodeql, "downloadCodeQL").resolves({
-        toolsVersion: expectedVersion,
-        codeqlFolder: "codeql",
-        toolsDownloadDurationMs: 200,
-    });
-    await (0, util_1.withTmpDir)(async (tmpDir) => {
-        (0, testing_utils_1.setupActionsVars)(tmpDir, tmpDir);
-        const result = await setupCodeql.setupCodeQLBundle(bundleUrl, testing_utils_1.SAMPLE_DOTCOM_API_DETAILS, "tmp/codeql_action_test/", util_1.GitHubVariant.DOTCOM, testing_utils_1.SAMPLE_DEFAULT_CLI_VERSION, logger);
-        // Basic sanity check that the version we got back is indeed the version that the
-        // bundle contains..
-        t.is(result.toolsVersion, expectedVersion);
-        // Ensure message logging CodeQL CLI version was present in user logs.
-        const expected_message = `Using CodeQL CLI version 2.16.0 sourced from ${bundleUrl}.`;
-        t.assert(loggedMessages.some((msg) => typeof msg.message === "string" &&
-            msg.message.includes(expected_message)));
-    });
-});
 //# sourceMappingURL=setup-codeql.test.js.map
--- a/lib/setup-codeql.test.js.map
+++ b/lib/setup-codeql.test.js.map
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Henry Mercer	f72882a05b	Merge pull request #2240 from github/backport-v2.25.0-df5a14dc2 Merge releases/v3 into releases/v2	2024-04-15 19:10:56 +01:00
github-actions[bot]	b9d792527d	Update checked-in dependencies	2024-04-15 15:53:17 +01:00
github-actions[bot]	12bc863d11	Update version and changelog for v2.25.0	2024-04-15 15:53:14 +01:00
github-actions[bot]	ba352fa8e7	Merge remote-tracking branch 'origin/releases/v3' into backport-v2.25.0-df5a14dc2	2024-04-15 12:22:19 +00:00
github-actions[bot]	d95215f691	Revert "Update checked-in dependencies" This reverts commit `82478fb458`.	2024-04-15 12:22:19 +00:00
github-actions[bot]	553a89d488	Revert "Update version and changelog for v2.24.10" This reverts commit `93075ceec3`.	2024-04-15 12:22:19 +00:00
Chuan-kai Lin	ffd3158cb9	Merge pull request #2228 from github/backport-v2.24.10-4355270be Merge releases/v3 into releases/v2	2024-04-05 10:06:57 -07:00
github-actions[bot]	82478fb458	Update checked-in dependencies	2024-04-05 16:45:18 +00:00
Chuan-kai Lin	2a96432c79	Resolve conflicts in codeql.ts	2024-04-05 09:11:43 -07:00
github-actions[bot]	93075ceec3	Update version and changelog for v2.24.10	2024-04-05 09:10:26 -07:00
github-actions[bot]	a023017ea9	Merge remote-tracking branch 'origin/releases/v3' into backport-v2.24.10-4355270be # Conflicts: # lib/codeql.js # src/codeql.ts	2024-04-05 15:02:14 +00:00
github-actions[bot]	794eacf375	Revert "Update checked-in dependencies" This reverts commit `61ddd48e03`.	2024-04-05 15:02:13 +00:00
github-actions[bot]	a1559aa4a9	Revert "Update version and changelog for v2.24.9" This reverts commit `abca38cf8c`.	2024-04-05 15:02:13 +00:00
Arthur Baars	a82bad7182	Merge pull request #2210 from github/backport-v2.24.9-1b1aada46 Merge releases/v3 into releases/v2	2024-03-22 12:05:51 +01:00
github-actions[bot]	61ddd48e03	Update checked-in dependencies	2024-03-22 10:40:56 +00:00
github-actions[bot]	abca38cf8c	Update version and changelog for v2.24.9	2024-03-22 10:37:25 +00:00
github-actions[bot]	763babe7ac	Merge remote-tracking branch 'origin/releases/v3' into backport-v2.24.9-1b1aada46	2024-03-22 10:37:20 +00:00
github-actions[bot]	72d46cb780	Revert "Update checked-in dependencies" This reverts commit `f018a9586e`.	2024-03-22 10:37:20 +00:00
github-actions[bot]	0b21c947c0	Revert "Update version and changelog for v2.24.8" This reverts commit `6007966519`.	2024-03-22 10:37:20 +00:00
Henry Mercer	c2dc67199a	Merge pull request #2202 from github/backport-v2.24.8-05963f47d Merge releases/v3 into releases/v2	2024-03-18 15:29:52 +00:00
github-actions[bot]	f018a9586e	Update checked-in dependencies	2024-03-18 15:12:05 +00:00
github-actions[bot]	6007966519	Update version and changelog for v2.24.8	2024-03-18 15:12:02 +00:00
Henry Mercer	efed72eb8f	Remove duplicate header	2024-03-18 15:10:38 +00:00
github-actions[bot]	bcca54f232	Merge remote-tracking branch 'origin/releases/v3' into backport-v2.24.8-05963f47d	2024-03-18 13:57:49 +00:00
github-actions[bot]	76d48637f2	Revert "Update checked-in dependencies" This reverts commit `6046c633c7`.	2024-03-18 13:57:49 +00:00
github-actions[bot]	4821ae1424	Revert "Update version and changelog for v2.24.7" This reverts commit `570dc010e8`.	2024-03-18 13:57:49 +00:00
Angela P Wen	e56cfd0877	Merge pull request #2194 from github/backport-v2.24.7-3ab410190 Merge releases/v3 into releases/v2	2024-03-12 11:24:48 -07:00
github-actions[bot]	6046c633c7	Update checked-in dependencies	2024-03-12 17:53:59 +00:00
Angela P Wen	ed2b6b741f	Manually fix changelog latest version	2024-03-12 13:52:46 -04:00
github-actions[bot]	570dc010e8	Update version and changelog for v2.24.7	2024-03-12 17:49:48 +00:00
github-actions[bot]	1a8046c7f3	Merge remote-tracking branch 'origin/releases/v3' into backport-v2.24.7-3ab410190	2024-03-12 17:49:46 +00:00
github-actions[bot]	8c395e0c45	Revert "Update checked-in dependencies" This reverts commit `2f52385615`.	2024-03-12 17:49:46 +00:00
github-actions[bot]	de22b302a6	Revert "Update version and changelog for v2.24.6" This reverts commit `272cd56763`.	2024-03-12 17:49:45 +00:00
Angela P Wen	928ff8c822	Merge pull request #2180 from github/backport-v2.24.6-8a470fdda Merge releases/v3 into releases/v2	2024-03-01 02:19:43 -08:00
github-actions[bot]	2f52385615	Update checked-in dependencies	2024-02-29 19:02:49 +00:00
Angela P Wen	272cd56763	Update version and changelog for v2.24.6	2024-02-29 19:02:49 +00:00
Angela P Wen	3839e215cc	Merge remote-tracking branch 'origin/releases/v3' into backport-v2.24.6-8a470fdda	2024-02-29 19:02:44 +00:00
Angela P Wen	61f4d893e6	Revert "Update checked-in dependencies" This reverts commit `045d9f3939`.	2024-02-29 17:28:33 +00:00
Angela P Wen	30ad6c3d9e	Revert "Update version and changelog for v2.24.5 - fixed" This reverts commit `a3c8eb3ab0`.	2024-02-29 17:28:33 +00:00
Nick Fyson	78df51c1cc	Merge pull request #2167 from github/nickfyson/fix-v2-changelog-history	2024-02-23 18:07:21 +00:00
github-actions[bot]	045d9f3939	Update checked-in dependencies	2024-02-23 14:57:36 +00:00
nickfyson	a3c8eb3ab0	Update version and changelog for v2.24.5 - fixed	2024-02-23 14:54:56 +00:00
github-actions[bot]	6078595fdf	Update checked-in dependencies	2024-02-23 14:48:52 +00:00
nickfyson	395cdfe20c	restore conflict-free state with head v3 branch	2024-02-23 14:39:06 +00:00
Chris Smowton	a56a03b370	Merge pull request #2166 from github/backport-v2.24.5-633baf86c Merge releases/v3 into releases/v2	2024-02-23 10:56:40 +00:00
github-actions[bot]	05053827ef	Update checked-in dependencies	2024-02-23 10:38:04 +00:00
Nick Fyson	fa5685c7f0	fix the mergeback changelog	2024-02-23 10:36:52 +00:00
github-actions[bot]	8c3591c19a	Update version and changelog for v2.24.5	2024-02-23 10:28:27 +00:00
github-actions[bot]	557a8d2306	Merge remote-tracking branch 'origin/releases/v3' into backport-v2.24.5-633baf86c	2024-02-23 10:28:27 +00:00
github-actions[bot]	7351df07bb	Revert "Update checked-in dependencies" This reverts commit `b882b63a68`.	2024-02-23 10:28:27 +00:00
github-actions[bot]	d15fdd879b	Revert "Update version and changelog for v2.24.4" This reverts commit `8b0f3e6135`.	2024-02-23 10:28:26 +00:00
Nick Fyson	80eb8d5395	Merge pull request #2159 from github/backport-v2.24.4-e2e140ad1 Merge releases/v3 into releases/v2	2024-02-22 13:47:24 +00:00
Nick Fyson	0ddabac401	manually fix problem with changelog produced by automation	2024-02-22 12:45:43 +00:00
github-actions[bot]	b882b63a68	Update checked-in dependencies	2024-02-22 12:00:01 +00:00
github-actions[bot]	8b0f3e6135	Update version and changelog for v2.24.4	2024-02-22 10:38:34 +00:00
github-actions[bot]	8601b9e70a	Merge remote-tracking branch 'origin/releases/v3' into backport-v2.24.4-e2e140ad1	2024-02-22 10:38:31 +00:00
github-actions[bot]	bd94b4c175	Revert "Update checked-in dependencies" This reverts commit `460939e7d8`.	2024-02-22 10:38:31 +00:00
github-actions[bot]	755340a6bd	Revert "Update version and changelog for v2.24.3" This reverts commit `47c8d615ed`.	2024-02-22 10:38:31 +00:00
Angela P Wen	4a8f20f6b9	Merge pull request #2150 from github/backport-v2.24.3-379614612 Merge releases/v3 into releases/v2	2024-02-15 05:14:12 -08:00
github-actions[bot]	460939e7d8	Update checked-in dependencies	2024-02-15 12:55:25 +00:00
Angela P Wen	ceebdeb9fa	Manually fix changelog notes	2024-02-15 12:53:40 +00:00
github-actions[bot]	47c8d615ed	Update version and changelog for v2.24.3	2024-02-15 12:47:29 +00:00
github-actions[bot]	c232c5de9c	Merge remote-tracking branch 'origin/releases/v3' into backport-v2.24.3-379614612	2024-02-15 12:47:28 +00:00
github-actions[bot]	2452b7d8af	Revert "Update checked-in dependencies" This reverts commit `4f50fb3be5`.	2024-02-15 12:47:28 +00:00
github-actions[bot]	4ffed09d48	Revert "Update version and changelog for v2.24.2" This reverts commit `02022337ac`.	2024-02-15 12:47:27 +00:00
Angela P Wen	8b6a45a6ec	Merge pull request #2144 from github/backport-v2.24.2-ece8414c7 Merge releases/v3 into releases/v2	2024-02-15 03:34:09 -08:00
Henry Mercer	2ccdcd5135	Remove duplicate changelog entry	2024-02-15 11:11:50 +00:00
github-actions[bot]	4f50fb3be5	Update checked-in dependencies	2024-02-15 11:10:16 +00:00
Henry Mercer	02022337ac	Update version and changelog for v2.24.2	2024-02-15 11:08:37 +00:00
Henry Mercer	3dafabe4d9	Merge remote-tracking branch 'origin/releases/v3' into backport-v2.24.2-ece8414c7	2024-02-15 11:08:04 +00:00
Henry Mercer	40cd785140	Revert "Update checked-in dependencies" This reverts commit `05d809f630`.	2024-02-15 11:07:08 +00:00
Henry Mercer	10746dd61e	Revert "Update version and changelog for v2.24.1" This reverts commit `d8c4c3a4eb`.	2024-02-15 11:07:08 +00:00
Dave Bartolomeo	1a077f8f6c	Merge pull request #2133 from github/backport-v2.24.1-e675ced7a Merge releases/v3 into releases/v2	2024-02-13 07:50:23 -08:00
github-actions[bot]	05d809f630	Update checked-in dependencies	2024-02-13 15:32:00 +00:00
Henry Mercer	d8c4c3a4eb	Update version and changelog for v2.24.1	2024-02-13 15:28:16 +00:00
Henry Mercer	b301568384	Merge remote-tracking branch 'origin/releases/v3' into backport-v2.24.1-e675ced7a	2024-02-13 15:28:12 +00:00
Henry Mercer	f5c8be0ac1	Revert "Update checked-in dependencies" This reverts commit `f822fa3067`.	2024-02-13 15:23:47 +00:00
Henry Mercer	4504810aa1	Revert "Update version and changelog for v2.24.0" This reverts commit `3ed798ed18`.	2024-02-13 15:23:47 +00:00
Henry Mercer	dc021d495c	Merge pull request #2115 from github/backport-v2.24.0-e8893c57a Merge releases/v3 into releases/v2	2024-02-02 19:23:13 +00:00
github-actions[bot]	f822fa3067	Update checked-in dependencies	2024-02-02 18:37:21 +00:00
github-actions[bot]	3ed798ed18	Update version and changelog for v2.24.0	2024-02-02 18:32:37 +00:00
github-actions[bot]	5b498ba405	Merge remote-tracking branch 'origin/releases/v3' into backport-v2.24.0-e8893c57a	2024-02-02 18:32:36 +00:00
github-actions[bot]	7dde705407	Revert "Update checked-in dependencies" This reverts commit `c98f2c953c`.	2024-02-02 18:32:36 +00:00
github-actions[bot]	c004a3e831	Revert "Update version and changelog for v2.23.2" This reverts commit `554c990fe8`.	2024-02-02 18:32:36 +00:00
Henry Mercer	2f93e4319b	Merge pull request #2102 from github/backport-v2.23.2-b7bf0a3ed Merge releases/v3 into releases/v2	2024-01-26 15:16:55 +00:00
github-actions[bot]	c98f2c953c	Update checked-in dependencies	2024-01-26 14:39:53 +00:00
github-actions[bot]	554c990fe8	Update version and changelog for v2.23.2	2024-01-26 14:35:10 +00:00
github-actions[bot]	abe5934e80	Merge remote-tracking branch 'origin/releases/v3' into backport-v2.23.2-b7bf0a3ed	2024-01-26 14:35:04 +00:00
github-actions[bot]	8879ae88d9	Revert "Update checked-in dependencies" This reverts commit `554005d264`.	2024-01-26 14:35:04 +00:00
github-actions[bot]	01e8d7f881	Revert "Update version and changelog for v2.23.1" This reverts commit `fb29452d38`.	2024-01-26 14:35:04 +00:00
Henry Mercer	4759df8df7	Merge pull request #2091 from github/backport-v2.23.1-0b21cf249 Merge releases/v3 into releases/v2	2024-01-17 17:39:22 +00:00
github-actions[bot]	554005d264	Update checked-in dependencies	2024-01-17 16:52:17 +00:00
github-actions[bot]	fb29452d38	Update version and changelog for v2.23.1	2024-01-17 16:25:35 +00:00
github-actions[bot]	13884cb7d7	Merge remote-tracking branch 'origin/releases/v3' into backport-v2.23.1-0b21cf249	2024-01-17 16:25:34 +00:00
github-actions[bot]	ac64986f93	Revert "Update checked-in dependencies" This reverts commit `e24bd8fed4`.	2024-01-17 16:25:34 +00:00
github-actions[bot]	cdcacf8b4f	Revert "Update version and changelog for v2.23.0" This reverts commit `8f2682add5`.	2024-01-17 16:25:34 +00:00
Henry Mercer	8b7fcbfac2	Merge pull request #2069 from github/backport-v2.23.0-e5f05b81d Merge releases/v3 into releases/v2	2024-01-08 13:43:00 +00:00
github-actions[bot]	e24bd8fed4	Update checked-in dependencies	2024-01-08 13:12:16 +00:00
Henry Mercer	8f2682add5	Update version and changelog for v2.23.0	2024-01-08 13:05:17 +00:00
Henry Mercer	8f5ae1a11a	Merge remote-tracking branch 'origin/releases/v3' into backport-v2.23.0-e5f05b81d	2024-01-08 13:04:05 +00:00
Henry Mercer	99d337aef5	Revert "Update checked-in dependencies" This reverts commit `d6286c6fdb`.	2024-01-08 13:04:04 +00:00
Henry Mercer	997d889b5d	Revert "Update version and changelog for v2.22.12" This reverts commit `9c74de20cb`.	2024-01-08 13:04:04 +00:00
Angela P Wen	1500a13138	Merge pull request #2054 from github/backport-v2.22.12-012739e50 * Bump the npm group with 4 updates Bumps the npm group with 4 updates: [@octokit/types](https://github.com/octokit/types.ts), [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin), [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) and [typescript](https://github.com/Microsoft/TypeScript). Updates `@octokit/types` from 12.3.0 to 12.4.0 - [Release notes](https://github.com/octokit/types.ts/releases) - [Commits](https://github.com/octokit/types.ts/compare/v12.3.0...v12.4.0) Updates `@typescript-eslint/eslint-plugin` from 6.13.2 to 6.14.0 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.14.0/packages/eslint-plugin) Updates `@typescript-eslint/parser` from 6.13.2 to 6.14.0 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.14.0/packages/parser) Updates `typescript` from 5.3.2 to 5.3.3 - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Commits](https://github.com/Microsoft/TypeScript/compare/v5.3.2...v5.3.3) --- updated-dependencies: - dependency-name: "@octokit/types" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: npm - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm ... Signed-off-by: dependabot[bot] <support@github.com> * Update checked-in dependencies * Update changelog and version after v3.22.11 * Update checked-in dependencies * improve handling of changelog processing for backports * change version numbers inside processing function as well * Apply suggestions from code review Co-authored-by: Henry Mercer <henry.mercer@me.com> * rename regex for clarity * preserve trailing whitespace when transforming CHANGELOG * raise explicit exception if EOF found when looking for changelog sections * add note on versioning approach to changelog * Bump the npm group with 2 updates (#2045) * Bump the npm group with 2 updates Bumps the npm group with 2 updates: [eslint](https://github.com/eslint/eslint) and [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import). Updates `eslint` from 8.55.0 to 8.56.0 - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.55.0...v8.56.0) Updates `eslint-plugin-import` from 2.29.0 to 2.29.1 - [Release notes](https://github.com/import-js/eslint-plugin-import/releases) - [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md) - [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.29.0...v2.29.1) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm - dependency-name: eslint-plugin-import dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm ... Signed-off-by: dependabot[bot] <support@github.com> * Update checked-in dependencies --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * clarify comment on versions in the changelog * clarify comment on versions in the changelog * Update default bundle to codeql-bundle-v2.15.5 * Add changelog note * update required checks script to handle release branches * add note about backporting check changes to v2 branch * Fix type error * Typecast `OLDEST_SUPPORTED_MAJOR_VERSION` when defined * Update changelog for v3.22.12 * Revert "Update version and changelog for v2.22.11" This reverts commit `e763762131`. * Revert "Update checked-in dependencies" This reverts commit `20d1a9b175`. * Update version and changelog for v2.22.12 * Update checked-in dependencies * Resolve conflicts in v3->v2.22.12 merge --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Henry Mercer <henry.mercer@me.com> Co-authored-by: Nick Fyson <nickfyson@github.com> Co-authored-by: Aditya Sharad <6874315+adityasharad@users.noreply.github.com> Co-authored-by: Angela P Wen <angelapwen@github.com> Co-authored-by: Aditya Sharad <adityasharad@github.com>	2023-12-22 08:39:43 -08:00
Aditya Sharad	0d318c9f1a	Resolve conflicts in v3->v2.22.12 merge	2023-12-22 06:58:29 -08:00
github-actions[bot]	d6286c6fdb	Update checked-in dependencies	2023-12-22 04:01:00 +00:00
github-actions[bot]	9c74de20cb	Update version and changelog for v2.22.12	2023-12-22 00:47:08 +00:00
github-actions[bot]	49a6ae4966	Merge remote-tracking branch 'origin/releases/v3' into backport-v2.22.12-012739e50 # Conflicts: # CONTRIBUTING.md	2023-12-22 00:47:04 +00:00
github-actions[bot]	3366e3bbdd	Revert "Update checked-in dependencies" This reverts commit `20d1a9b175`.	2023-12-22 00:47:03 +00:00
github-actions[bot]	844fc3cd56	Revert "Update version and changelog for v2.22.11" This reverts commit `e763762131`.	2023-12-22 00:47:03 +00:00
Nick Fyson	5a201efe22	Merge pull request #2048 from github/nickfyson/backport-js-checks	2023-12-20 19:21:03 +00:00
nickfyson	c9f92aa25f	backport checks changes to v2 branch	2023-12-20 14:23:29 +00:00
Nick Fyson	03e7845b7b	Merge pull request #2036 from github/backport-v2.22.11-b374143c1 Merge releases/v3 into releases/v2	2023-12-13 20:40:33 +00:00
github-actions[bot]	54f10077ea	Rebuild	2023-12-13 20:11:03 +00:00
github-actions[bot]	20d1a9b175	Update checked-in dependencies	2023-12-13 20:08:43 +00:00
Nick Fyson	c28d79bb2e	Update src/codeql.ts Co-authored-by: Henry Mercer <henry.mercer@me.com>	2023-12-13 20:05:23 +00:00
nickfyson	241e8b42b2	Revert "switch check sarif action to node20" This reverts commit `0bc194ee69`.	2023-12-13 20:05:23 +00:00
nickfyson	8bc67d15e2	Revert "update javascript files" This reverts commit `3a9f6a89e0`.	2023-12-13 20:05:23 +00:00
nickfyson	e106171cbb	Revert "reintroduce PR check that confirm action can be still be compiled on node16" This reverts commit `5b52b36d41`.	2023-12-13 20:05:23 +00:00
nickfyson	231f9f1b59	Revert "upgrade node type definitions" This reverts commit `f2d0c2e7ae`.	2023-12-13 20:05:23 +00:00
nickfyson	47334bf4e9	Revert "change to node20 for all actions" This reverts commit `d651fbc494`.	2023-12-13 20:05:23 +00:00
github-actions[bot]	e763762131	Update version and changelog for v2.22.11	2023-12-13 20:05:18 +00:00