Merge pull request #2286 from github/koesie10/ghec-dr-db-upload

Enable database uploads for GHEC-DR
Merge pull request #2294 from github/dependabot/npm_and_yarn/npm-d3285d5234
2026-05-04 04:40:09 +00:00 · 2024-05-15 14:49:47 +02:00 · 2024-05-15 13:48:49 +01:00 · 2024-05-15 09:38:11 +00:00 · 2024-05-15 09:37:09 +00:00 · 2024-05-14 11:43:12 +02:00
383 changed files with 66405 additions and 19732 deletions
@@ -29,7 +29,16 @@ inputs:
  tools:
    required: true
    description: |
-      The url of codeql to use.
+      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.

 runs:
  using: composite
@@ -16,5 +16,5 @@ inputs:
      Comma separated list of query ids that should NOT be included in this SARIF file.

 runs:
-  using: node16
+  using: node20
  main: index.js
@@ -23,7 +23,16 @@ inputs:
  tools:
    required: true
    description: |
-      The url of codeql to use.
+      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.

 runs:
  using: composite
@@ -18,12 +18,12 @@ runs:
    - name: Set up Python
      uses: actions/setup-python@v5
      with:
-        python-version: 3.8
+        python-version: 3.12

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

    - name: Update git config
@@ -1,5 +1,6 @@
 import argparse
 import datetime
+import fileinput
 import re
 from github import Github
 import json
@@ -171,6 +172,19 @@ 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)
@@ -374,9 +388,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}')
-    subprocess.check_output(['npm', 'version', version, '--no-git-tag-version'])
-    run_git('add', 'package.json', 'package-lock.json')
+    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')

    # 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}')
@@ -25,6 +25,7 @@ on:
 jobs:
  all-platform-bundle:
    strategy:
+      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -39,7 +40,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          matrix.os == 'macos-latest' && (
+          runner.os == 'macOS' && (

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

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

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

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

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

@@ -25,6 +25,7 @@ on:
 jobs:
  autobuild-direct-tracing:
    strategy:
+      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -45,7 +46,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          matrix.os == 'macos-latest' && (
+          runner.os == 'macOS' && (

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -102,6 +103,9 @@ 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
@@ -25,6 +25,7 @@ on:
 jobs:
  go-indirect-tracing-workaround-diagnostic:
    strategy:
+      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -39,7 +40,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          matrix.os == 'macos-latest' && (
+          runner.os == 'macOS' && (

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -86,6 +87,10 @@ 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:
@@ -25,6 +25,7 @@ on:
 jobs:
  packaging-codescanning-config-inputs-js:
    strategy:
+      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -55,7 +56,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          matrix.os == 'macos-latest' && (
+          runner.os == 'macOS' && (

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -86,6 +87,10 @@ 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:
@@ -25,6 +25,7 @@ on:
 jobs:
  split-workflow:
    strategy:
+      fail-fast: false
      matrix:
        include:
          - os: ubuntu-latest
@@ -49,7 +50,7 @@ jobs:
      - name: Setup Python on MacOS
        uses: actions/setup-python@v5
        if: >-
-          matrix.os == 'macos-latest' && (
+          runner.os == 'macOS' && (

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -73,6 +73,7 @@ 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) }}
@@ -24,6 +24,7 @@ jobs:
    continue-on-error: true

    strategy:
+      fail-fast: false
      matrix:
        include:
        - os: ubuntu-latest
@@ -22,6 +22,7 @@ on:
 jobs:
  upload-artifacts:
    strategy:
+      fail-fast: false
      matrix:
        version:
        - stable-20230403
@@ -16,8 +16,9 @@ jobs:
    timeout-minutes: 45

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

    steps:
      - name: Checkout
@@ -49,7 +50,6 @@ 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,6 +90,7 @@ 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 }}
@@ -22,6 +22,7 @@ on:
 jobs:
  test-codeql-bundle-all:
    strategy:
+      fail-fast: false
      matrix:
        include:
        - os: ubuntu-latest
@@ -4,96 +4,118 @@ 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.

-## 2.25.2 - 22 Apr 2024
+## [UNRELEASED]

 No user facing changes.

-## 2.25.1 - 17 Apr 2024
+## 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)

-## 2.25.0 - 15 Apr 2024
+## 3.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)

-## 2.24.10 - 05 Apr 2024
+## 3.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.

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

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

-## 2.24.8 - 18 Mar 2024
+## 3.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)

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

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

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

 No user facing changes.

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

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

-## 2.24.4 - 21 Feb 2024
+## 3.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)

-## 2.24.3 - 15 Feb 2024
+## 3.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)

-## 2.24.2 - 15 Feb 2024
+## 3.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)

-## 2.24.1 - 13 Feb 2024
+## 3.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)

-## 2.24.0 - 02 Feb 2024
+## 3.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)

-## 2.23.2 - 26 Jan 2024
+## 3.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)

-## 2.23.1 - 17 Jan 2024
+## 3.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)

-## 2.23.0 - 08 Jan 2024
+## 3.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)

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

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

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

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

 ## 2.22.10 - 12 Dec 2023

@@ -3,6 +3,7 @@
 [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.

@@ -84,6 +85,7 @@ 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.
@@ -33,6 +33,22 @@ 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).
@@ -86,6 +86,6 @@ outputs:
  sarif-id:
    description: The ID of the uploaded SARIF file.
 runs:
-  using: node16
+  using: node20
  main: "../lib/analyze-action.js"
  post: "../lib/analyze-action-post.js"
@@ -15,5 +15,5 @@ inputs:
      $GITHUB_WORKSPACE as its working directory.
    required: false
 runs:
-  using: node16
+  using: node20
  main: '../lib/autobuild-action.js'
@@ -3,9 +3,19 @@ description: 'Set up CodeQL'
 author: 'GitHub'
 inputs:
  tools:
-    description: URL of CodeQL 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.
    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.
@@ -133,6 +143,6 @@ outputs:
  codeql-path:
    description: The path of the CodeQL binary used for analysis
 runs:
-  using: node16
+  using: node20
  main: '../lib/init-action.js'
  post: '../lib/init-action-post.js'
@@ -174,7 +174,7 @@ async function runQueries(sarifFolder, memoryFlag, addSnippetsFlag, threadsFlag,
                }
                statusReport["event_reports"].push(perQueryAlertCountEventReport);
            }
-            if (!(await util.codeQlVersionAbove(codeql, codeql_1.CODEQL_VERSION_ANALYSIS_SUMMARY_V2))) {
+            if (!(await util.codeQlVersionAtLeast(codeql, codeql_1.CODEQL_VERSION_ANALYSIS_SUMMARY_V2))) {
                await runPrintLinesOfCode(language);
            }
        }
@@ -225,13 +225,10 @@ 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);
-    // 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)(codeql, config, features);
+    // 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);
+    }
    return timings;
 }
 exports.runFinalize = runFinalize;
@@ -34,6 +34,7 @@ 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)());
@@ -81,6 +82,9 @@ async function run() {
                await (0, autobuild_1.runAutobuild)(config, language, features, 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);
@@ -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":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAsC;AAEtC,iDAIwB;AACxB,6CAAgD;AAChD,2CAAwE;AACxE,qCAAqC;AACrC,iDAAmD;AACnD,+CAAuC;AACvC,mDAA2C;AAE3C,uCAAqD;AACrD,6CAAkD;AAClD,mDAMyB;AACzB,mDAAuD;AACvD,iCAOgB;AAShB,KAAK,UAAU,yBAAyB,CACtC,MAA0B,EAC1B,MAAc,EACd,SAAe,EACf,YAAsB,EACtB,eAAwB,EACxB,KAAa;IAEb,IAAA,4BAAqB,EAAC,IAAA,+BAAgB,GAAE,CAAC,CAAC;IAE1C,MAAM,MAAM,GAAG,IAAA,gCAAgB,EAAC,KAAK,EAAE,eAAe,CAAC,CAAC;IACxD,MAAM,gBAAgB,GAAG,MAAM,IAAA,sCAAsB,EACnD,0BAAU,CAAC,SAAS,EACpB,MAAM,EACN,SAAS,EACT,MAAM,EACN,MAAM,IAAA,qBAAc,EAAC,MAAM,CAAC,EAC5B,MAAM,EACN,KAAK,EAAE,OAAO,EACd,KAAK,EAAE,KAAK,CACb,CAAC;IACF,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;QACnC,MAAM,YAAY,GAA0B;YAC1C,GAAG,gBAAgB;YACnB,mBAAmB,EAAE,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC;YAC3C,iBAAiB,EAAE,eAAe;SACnC,CAAC;QACF,MAAM,IAAA,gCAAgB,EAAC,YAAY,CAAC,CAAC;IACvC,CAAC;AACH,CAAC;AAED,KAAK,UAAU,GAAG;IAChB,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC;IAC7B,MAAM,MAAM,GAAG,IAAA,0BAAgB,GAAE,CAAC;IAClC,IAAI,MAA0B,CAAC;IAC/B,IAAI,eAAqC,CAAC;IAC1C,IAAI,SAAiC,CAAC;IACtC,IAAI,CAAC;QACH,MAAM,gBAAgB,GAAG,MAAM,IAAA,sCAAsB,EACnD,0BAAU,CAAC,SAAS,EACpB,UAAU,EACV,SAAS,EACT,MAAM,EACN,MAAM,IAAA,qBAAc,EAAC,MAAM,CAAC,EAC5B,MAAM,CACP,CAAC;QACF,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;YACnC,MAAM,IAAA,gCAAgB,EAAC,gBAAgB,CAAC,CAAC;QAC3C,CAAC;QAED,MAAM,aAAa,GAAG,MAAM,IAAA,6BAAgB,GAAE,CAAC;QAC/C,IAAA,gCAAyB,EAAC,aAAa,EAAE,MAAM,CAAC,CAAC;QACjD,IAAA,yBAAkB,EAAC,IAAA,+BAAgB,GAAE,EAAE,aAAa,CAAC,CAAC;QAEtD,MAAM,aAAa,GAAG,IAAA,+BAAkB,EACtC,IAAA,0BAAmB,EAAC,mBAAmB,CAAC,CACzC,CAAC;QAEF,MAAM,QAAQ,GAAG,IAAI,wBAAQ,CAC3B,aAAa,EACb,aAAa,EACb,IAAA,oCAAqB,GAAE,EACvB,MAAM,CACP,CAAC;QAEF,MAAM,GAAG,MAAM,IAAA,wBAAS,EAAC,IAAA,oCAAqB,GAAE,EAAE,MAAM,CAAC,CAAC;QAC1D,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CACb,yFAAyF,CAC1F,CAAC;QACJ,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAA,kBAAS,EAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAEjD,SAAS,GAAG,MAAM,IAAA,uCAA2B,EAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QACtE,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC5B,MAAM,gBAAgB,GAAG,IAAA,+BAAgB,EAAC,mBAAmB,CAAC,CAAC;YAC/D,IAAI,gBAAgB,EAAE,CAAC;gBACrB,MAAM,CAAC,IAAI,CACT,6CAA6C,gBAAgB,EAAE,CAChE,CAAC;gBACF,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;YAClC,CAAC;YACD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;gBACjC,eAAe,GAAG,QAAQ,CAAC;gBAC3B,MAAM,IAAA,wBAAY,EAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;YACzD,CAAC;QACH,CAAC;QAED,+FAA+F;QAC/F,oBAAoB;QACpB,MAAM,IAAA,oCAAoB,EAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC/D,CAAC;IAAC,OAAO,cAAc,EAAE,CAAC;QACxB,MAAM,KAAK,GAAG,IAAA,gBAAS,EAAC,cAAc,CAAC,CAAC;QACxC,IAAI,CAAC,SAAS,CACZ,kIAAkI,KAAK,CAAC,OAAO,EAAE,CAClJ,CAAC;QACF,MAAM,yBAAyB,CAC7B,MAAM,EACN,MAAM,EACN,SAAS,EACT,SAAS,IAAI,EAAE,EACf,eAAe,EACf,KAAK,CACN,CAAC;QACF,OAAO;IACT,CAAC;IAED,IAAI,CAAC,cAAc,CAAC,oBAAM,CAAC,mCAAmC,EAAE,MAAM,CAAC,CAAC;IAExE,MAAM,yBAAyB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,IAAI,EAAE,CAAC,CAAC;AAC9E,CAAC;AAED,KAAK,UAAU,UAAU;IACvB,IAAI,CAAC;QACH,MAAM,GAAG,EAAE,CAAC;IACd,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,SAAS,CAAC,4BAA4B,IAAA,gBAAS,EAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;IACzE,CAAC;AACH,CAAC;AAED,KAAK,UAAU,EAAE,CAAC"}
@@ -141,11 +141,11 @@ async function runAutobuild(config, language, features, logger) {
        await setupCppAutobuild(codeQL, logger);
    }
    if (config.buildMode &&
-        (await features.getValue(feature_flags_1.Feature.AutobuildDirectTracingEnabled, codeQL))) {
+        (await features.getValue(feature_flags_1.Feature.AutobuildDirectTracing, codeQL))) {
        await codeQL.extractUsingBuildMode(config, language);
    }
    else {
-        await codeQL.runAutobuild(config, language, features);
+        await codeQL.runAutobuild(config, language);
    }
    if (language === languages_1.Language.go) {
        core.exportVariable(environment_1.EnvVar.DID_AUTOBUILD_GOLANG, "true");
@@ -1 +1 @@
-{"version":3,"file":"autobuild.js","sourceRoot":"","sources":["../src/autobuild.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAsC;AAEtC,iDAA6E;AAC7E,6CAAgD;AAChD,qCAA6C;AAE7C,+CAAuC;AACvC,mDAKyB;AACzB,2CAAyD;AAEzD,6CAAkD;AAClD,qDAAgD;AAChD,iCAAwD;AAEjD,KAAK,UAAU,2BAA2B,CAC/C,MAAc,EACd,MAA0B,EAC1B,MAAc;IAEd,IACE,CAAC,MAAM,CAAC,SAAS,KAAK,gBAAS,CAAC,IAAI;QAClC,CAAC,MAAM,MAAM,CAAC,eAAe,CAAC,6BAAY,CAAC,wBAAwB,CAAC,CAAC,CAAC;QACxE,MAAM,CAAC,SAAS,KAAK,gBAAS,CAAC,MAAM,EACrC,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,SAAS,MAAM,CAAC,SAAS,oCAAoC,CAAC,CAAC;QAC3E,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,0CAA0C;IAC1C,mFAAmF;IACnF,oFAAoF;IACpF,4EAA4E;IAC5E,MAAM,kBAAkB,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CACvD,IAAA,4BAAgB,EAAC,CAAC,CAAC,CACpB,CAAC;IAEF,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,MAAM,CAAC,IAAI,CACT,iEAAiE,CAClE,CAAC;QACF,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;OA0BG;IACH,MAAM,2BAA2B,GAAG,kBAAkB,CAAC,MAAM,CAC3D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,oBAAQ,CAAC,EAAE,CACzB,CAAC;IAEF,MAAM,SAAS,GAAe,EAAE,CAAC;IACjC,yEAAyE;IACzE,UAAU;IACV,IAAI,2BAA2B,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;QACjD,SAAS,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC,CAAC,CAAC,CAAC;IACjD,CAAC;IACD,uEAAuE;IACvE,wCAAwC;IACxC,IAAI,kBAAkB,CAAC,MAAM,KAAK,2BAA2B,CAAC,MAAM,EAAE,CAAC;QACrE,SAAS,CAAC,IAAI,CAAC,oBAAQ,CAAC,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,kBAAkB,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAE3D,2EAA2E;IAC3E,4EAA4E;IAC5E,2CAA2C;IAC3C,uEAAuE;IACvE,2EAA2E;IAC3E,uEAAuE;IACvE,yCAAyC;IACzC,IAAI,2BAA2B,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3C,MAAM,CAAC,OAAO,CACZ,oCAAoC,SAAS,CAAC,IAAI,CAChD,OAAO,CACR,8BAA8B,2BAA2B;aACvD,KAAK,CAAC,CAAC,CAAC;aACR,IAAI,CACH,OAAO,CACR,kFAAkF;YACnF,4BAA4B;YAC5B,0NAA0N,CAC7N,CAAC;IACJ,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAhGD,kEAgGC;AAEM,KAAK,UAAU,iBAAiB,CAAC,MAAc,EAAE,MAAc;IACpE,MAAM,MAAM,GAAG,6BAAa,CAAC,uBAAO,CAAC,yBAAyB,CAAC,CAAC,MAAM,CAAC;IACvE,MAAM,WAAW,GAAG,4CAA4C,CAAC;IACjE,MAAM,MAAM,GACV,wHAAwH,CAAC;IAC3H,MAAM,aAAa,GAAG,MAAM,IAAA,6BAAgB,GAAE,CAAC;IAC/C,MAAM,aAAa,GAAG,IAAA,+BAAkB,EACtC,IAAA,0BAAmB,EAAC,mBAAmB,CAAC,CACzC,CAAC;IACF,MAAM,QAAQ,GAAG,IAAI,wBAAQ,CAC3B,aAAa,EACb,aAAa,EACb,IAAA,oCAAqB,GAAE,EACvB,MAAM,CACP,CAAC;IACF,IAAI,MAAM,QAAQ,CAAC,QAAQ,CAAC,uBAAO,CAAC,yBAAyB,EAAE,MAAM,CAAC,EAAE,CAAC;QACvE,yEAAyE;QACzE,IACE,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,KAAK,aAAa;YACnD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,MAAM,EAC9B,CAAC;YACD,MAAM,CAAC,IAAI,CACT,aAAa,WAAW,sCACtB,IAAA,mCAAoB,GAAE,KAAK,SAAS;gBAClC,CAAC,CAAC,8BAA8B,MAAM,yDAAyD,MAAM,IAAI;gBACzG,CAAC,CAAC,EACN,EAAE,CACH,CAAC;YACF,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACvC,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,IAAI,CACT,YAAY,WAAW,yCAAyC,MAAM,yCAAyC,MAAM,IAAI,CAC1H,CAAC;YACF,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,IAAI,CAAC,aAAa,WAAW,GAAG,CAAC,CAAC;QACzC,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,CAAC;AACH,CAAC;AAvCD,8CAuCC;AAEM,KAAK,UAAU,YAAY,CAChC,MAA0B,EAC1B,QAAkB,EAClB,QAA2B,EAC3B,MAAc;IAEd,MAAM,CAAC,UAAU,CAAC,qCAAqC,QAAQ,OAAO,CAAC,CAAC;IACxE,MAAM,MAAM,GAAG,MAAM,IAAA,kBAAS,EAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACjD,IAAI,QAAQ,KAAK,oBAAQ,CAAC,GAAG,EAAE,CAAC;QAC9B,MAAM,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,CAAC;IACD,IACE,MAAM,CAAC,SAAS;QAChB,CAAC,MAAM,QAAQ,CAAC,QAAQ,CAAC,uBAAO,CAAC,6BAA6B,EAAE,MAAM,CAAC,CAAC,EACxE,CAAC;QACD,MAAM,MAAM,CAAC,qBAAqB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACvD,CAAC;SAAM,CAAC;QACN,MAAM,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACxD,CAAC;IACD,IAAI,QAAQ,KAAK,oBAAQ,CAAC,EAAE,EAAE,CAAC;QAC7B,IAAI,CAAC,cAAc,CAAC,oBAAM,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;IAC3D,CAAC;IACD,MAAM,CAAC,QAAQ,EAAE,CAAC;AACpB,CAAC;AAvBD,oCAuBC"}
+{"version":3,"file":"autobuild.js","sourceRoot":"","sources":["../src/autobuild.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAsC;AAEtC,iDAA6E;AAC7E,6CAAgD;AAChD,qCAA6C;AAE7C,+CAAuC;AACvC,mDAKyB;AACzB,2CAAyD;AAEzD,6CAAkD;AAClD,qDAAgD;AAChD,iCAAwD;AAEjD,KAAK,UAAU,2BAA2B,CAC/C,MAAc,EACd,MAA0B,EAC1B,MAAc;IAEd,IACE,CAAC,MAAM,CAAC,SAAS,KAAK,gBAAS,CAAC,IAAI;QAClC,CAAC,MAAM,MAAM,CAAC,eAAe,CAAC,6BAAY,CAAC,wBAAwB,CAAC,CAAC,CAAC;QACxE,MAAM,CAAC,SAAS,KAAK,gBAAS,CAAC,MAAM,EACrC,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,SAAS,MAAM,CAAC,SAAS,oCAAoC,CAAC,CAAC;QAC3E,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,0CAA0C;IAC1C,mFAAmF;IACnF,oFAAoF;IACpF,4EAA4E;IAC5E,MAAM,kBAAkB,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CACvD,IAAA,4BAAgB,EAAC,CAAC,CAAC,CACpB,CAAC;IAEF,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,MAAM,CAAC,IAAI,CACT,iEAAiE,CAClE,CAAC;QACF,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;OA0BG;IACH,MAAM,2BAA2B,GAAG,kBAAkB,CAAC,MAAM,CAC3D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,oBAAQ,CAAC,EAAE,CACzB,CAAC;IAEF,MAAM,SAAS,GAAe,EAAE,CAAC;IACjC,yEAAyE;IACzE,UAAU;IACV,IAAI,2BAA2B,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;QACjD,SAAS,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC,CAAC,CAAC,CAAC;IACjD,CAAC;IACD,uEAAuE;IACvE,wCAAwC;IACxC,IAAI,kBAAkB,CAAC,MAAM,KAAK,2BAA2B,CAAC,MAAM,EAAE,CAAC;QACrE,SAAS,CAAC,IAAI,CAAC,oBAAQ,CAAC,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,kBAAkB,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAE3D,2EAA2E;IAC3E,4EAA4E;IAC5E,2CAA2C;IAC3C,uEAAuE;IACvE,2EAA2E;IAC3E,uEAAuE;IACvE,yCAAyC;IACzC,IAAI,2BAA2B,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3C,MAAM,CAAC,OAAO,CACZ,oCAAoC,SAAS,CAAC,IAAI,CAChD,OAAO,CACR,8BAA8B,2BAA2B;aACvD,KAAK,CAAC,CAAC,CAAC;aACR,IAAI,CACH,OAAO,CACR,kFAAkF;YACnF,4BAA4B;YAC5B,0NAA0N,CAC7N,CAAC;IACJ,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAhGD,kEAgGC;AAEM,KAAK,UAAU,iBAAiB,CAAC,MAAc,EAAE,MAAc;IACpE,MAAM,MAAM,GAAG,6BAAa,CAAC,uBAAO,CAAC,yBAAyB,CAAC,CAAC,MAAM,CAAC;IACvE,MAAM,WAAW,GAAG,4CAA4C,CAAC;IACjE,MAAM,MAAM,GACV,wHAAwH,CAAC;IAC3H,MAAM,aAAa,GAAG,MAAM,IAAA,6BAAgB,GAAE,CAAC;IAC/C,MAAM,aAAa,GAAG,IAAA,+BAAkB,EACtC,IAAA,0BAAmB,EAAC,mBAAmB,CAAC,CACzC,CAAC;IACF,MAAM,QAAQ,GAAG,IAAI,wBAAQ,CAC3B,aAAa,EACb,aAAa,EACb,IAAA,oCAAqB,GAAE,EACvB,MAAM,CACP,CAAC;IACF,IAAI,MAAM,QAAQ,CAAC,QAAQ,CAAC,uBAAO,CAAC,yBAAyB,EAAE,MAAM,CAAC,EAAE,CAAC;QACvE,yEAAyE;QACzE,IACE,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,KAAK,aAAa;YACnD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,MAAM,EAC9B,CAAC;YACD,MAAM,CAAC,IAAI,CACT,aAAa,WAAW,sCACtB,IAAA,mCAAoB,GAAE,KAAK,SAAS;gBAClC,CAAC,CAAC,8BAA8B,MAAM,yDAAyD,MAAM,IAAI;gBACzG,CAAC,CAAC,EACN,EAAE,CACH,CAAC;YACF,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACvC,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,IAAI,CACT,YAAY,WAAW,yCAAyC,MAAM,yCAAyC,MAAM,IAAI,CAC1H,CAAC;YACF,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,IAAI,CAAC,aAAa,WAAW,GAAG,CAAC,CAAC;QACzC,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,CAAC;AACH,CAAC;AAvCD,8CAuCC;AAEM,KAAK,UAAU,YAAY,CAChC,MAA0B,EAC1B,QAAkB,EAClB,QAA2B,EAC3B,MAAc;IAEd,MAAM,CAAC,UAAU,CAAC,qCAAqC,QAAQ,OAAO,CAAC,CAAC;IACxE,MAAM,MAAM,GAAG,MAAM,IAAA,kBAAS,EAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACjD,IAAI,QAAQ,KAAK,oBAAQ,CAAC,GAAG,EAAE,CAAC;QAC9B,MAAM,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,CAAC;IACD,IACE,MAAM,CAAC,SAAS;QAChB,CAAC,MAAM,QAAQ,CAAC,QAAQ,CAAC,uBAAO,CAAC,sBAAsB,EAAE,MAAM,CAAC,CAAC,EACjE,CAAC;QACD,MAAM,MAAM,CAAC,qBAAqB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACvD,CAAC;SAAM,CAAC;QACN,MAAM,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC9C,CAAC;IACD,IAAI,QAAQ,KAAK,oBAAQ,CAAC,EAAE,EAAE,CAAC;QAC7B,IAAI,CAAC,cAAc,CAAC,oBAAM,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;IAC3D,CAAC;IACD,MAAM,CAAC,QAAQ,EAAE,CAAC;AACpB,CAAC;AAvBD,oCAuBC"}
@@ -117,6 +117,7 @@ function ensureEndsInPeriod(text) {
 var CliConfigErrorCategory;
 (function (CliConfigErrorCategory) {
    CliConfigErrorCategory["ExternalRepositoryCloneFailed"] = "ExternalRepositoryCloneFailed";
+    CliConfigErrorCategory["GracefulOutOfMemory"] = "GracefulOutOfMemory";
    CliConfigErrorCategory["GradleBuildFailed"] = "GradleBuildFailed";
    CliConfigErrorCategory["IncompatibleWithActionVersion"] = "IncompatibleWithActionVersion";
    CliConfigErrorCategory["InitCalledTwice"] = "InitCalledTwice";
@@ -127,6 +128,7 @@ var CliConfigErrorCategory;
    CliConfigErrorCategory["NoSourceCodeSeen"] = "NoSourceCodeSeen";
    CliConfigErrorCategory["NoSupportedBuildCommandSucceeded"] = "NoSupportedBuildCommandSucceeded";
    CliConfigErrorCategory["NoSupportedBuildSystemDetected"] = "NoSupportedBuildSystemDetected";
+    CliConfigErrorCategory["PackCannotBeFound"] = "PackCannotBeFound";
    CliConfigErrorCategory["SwiftBuildFailed"] = "SwiftBuildFailed";
    CliConfigErrorCategory["UnsupportedBuildMode"] = "UnsupportedBuildMode";
 })(CliConfigErrorCategory || (exports.CliConfigErrorCategory = CliConfigErrorCategory = {}));
@@ -140,6 +142,9 @@ exports.cliErrorsConfig = {
            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."),
@@ -195,6 +200,11 @@ 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"),
@@ -274,13 +274,13 @@ async function getCodeQLForCmd(cmd, checkVersion) {
            if (qlconfigFile !== undefined) {
                extraArgs.push(`--qlconfig-file=${qlconfigFile}`);
            }
-            if (await util.codeQlVersionAbove(this, exports.CODEQL_VERSION_LANGUAGE_BASELINE_CONFIG)) {
+            if (await util.codeQlVersionAtLeast(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.codeQlVersionAbove(this, exports.CODEQL_VERSION_SUBLANGUAGE_FILE_COVERAGE)) {
+            else if (await util.codeQlVersionAtLeast(this, exports.CODEQL_VERSION_SUBLANGUAGE_FILE_COVERAGE)) {
                extraArgs.push("--no-sublanguage-file-coverage");
            }
            await runTool(cmd, [
@@ -297,19 +297,8 @@ async function getCodeQLForCmd(cmd, checkVersion) {
                }),
            ], { stdin: externalRepositoryToken });
        },
-        async runAutobuild(config, language, features) {
+        async runAutobuild(config, language) {
            applyAutobuildAzurePipelinesTimeoutFix();
-            if (await features.getValue(feature_flags_1.Feature.AutobuildDirectTracingEnabled, this)) {
-                await runTool(cmd, [
-                    "database",
-                    "trace-command",
-                    ...(await getTrapCachingExtractorConfigArgsForLang(config, language)),
-                    ...getExtractionVerbosityArguments(config.debugMode),
-                    ...getExtraOptionsFromEnv(["database", "trace-command"]),
-                    util.getCodeQLDatabasePath(config, language),
-                ]);
-                return;
-            }
            const autobuildCmd = path.join(await this.resolveExtractor(language), "tools", process.platform === "win32" ? "autobuild.cmd" : "autobuild.sh");
            // Bump the verbosity of the autobuild command if we're in debug mode
            if (config.debugMode) {
@@ -469,7 +458,7 @@ async function getCodeQLForCmd(cmd, checkVersion) {
                    ignoringOptions: ["--expect-discarded-cache"],
                }),
            ];
-            if (await util.codeQlVersionAbove(this, feature_flags_1.CODEQL_VERSION_FINE_GRAINED_PARALLELISM)) {
+            if (await util.codeQlVersionAtLeast(this, feature_flags_1.CODEQL_VERSION_FINE_GRAINED_PARALLELISM)) {
                codeqlArgs.push("--intra-layer-parallelism");
            }
            await runTool(cmd, codeqlArgs);
@@ -503,7 +492,7 @@ async function getCodeQLForCmd(cmd, checkVersion) {
            if (await isSublanguageFileCoverageEnabled(config, this)) {
                codeqlArgs.push("--sublanguage-file-coverage");
            }
-            else if (await util.codeQlVersionAbove(this, exports.CODEQL_VERSION_SUBLANGUAGE_FILE_COVERAGE)) {
+            else if (await util.codeQlVersionAtLeast(this, exports.CODEQL_VERSION_SUBLANGUAGE_FILE_COVERAGE)) {
                codeqlArgs.push("--no-sublanguage-file-coverage");
            }
            if (shouldExportDiagnostics) {
@@ -512,7 +501,7 @@ async function getCodeQLForCmd(cmd, checkVersion) {
            else {
                codeqlArgs.push("--no-sarif-include-diagnostics");
            }
-            if ((await util.codeQlVersionAbove(this, exports.CODEQL_VERSION_ANALYSIS_SUMMARY_V2)) &&
+            if ((await util.codeQlVersionAtLeast(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");
            }
@@ -693,12 +682,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.codeQlVersionAbove(codeql, CODEQL_MINIMUM_VERSION))) {
+        !(await util.codeQlVersionAtLeast(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.codeQlVersionAbove(codeql, CODEQL_NEXT_MINIMUM_VERSION))) {
+        !(await util.codeQlVersionAtLeast(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 ` +
@@ -894,10 +883,10 @@ function getGeneratedCodeScanningConfigPath(config) {
 }
 exports.getGeneratedCodeScanningConfigPath = getGeneratedCodeScanningConfigPath;
 async function isDiagnosticsExportInvalidSarifFixed(codeql) {
-    return await util.codeQlVersionAbove(codeql, exports.CODEQL_VERSION_DIAGNOSTICS_EXPORT_FIXED);
+    return await util.codeQlVersionAtLeast(codeql, exports.CODEQL_VERSION_DIAGNOSTICS_EXPORT_FIXED);
 }
 async function getLanguageAliasingArguments(codeql) {
-    if (await util.codeQlVersionAbove(codeql, exports.CODEQL_VERSION_LANGUAGE_ALIASING)) {
+    if (await util.codeQlVersionAtLeast(codeql, exports.CODEQL_VERSION_LANGUAGE_ALIASING)) {
        return ["--extractor-include-aliases"];
    }
    return [];
@@ -907,10 +896,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.codeQlVersionAbove(codeql, exports.CODEQL_VERSION_SUBLANGUAGE_FILE_COVERAGE)));
+        (await util.codeQlVersionAtLeast(codeql, exports.CODEQL_VERSION_SUBLANGUAGE_FILE_COVERAGE)));
 }
 async function getCodeScanningQueryHelpArguments(codeql) {
-    if (await util.codeQlVersionAbove(codeql, CODEQL_VERSION_INCLUDE_QUERY_HELP)) {
+    if (await util.codeQlVersionAtLeast(codeql, CODEQL_VERSION_INCLUDE_QUERY_HELP)) {
        return ["--sarif-include-query-help=always"];
    }
    return ["--sarif-add-query-help"];
@@ -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, (0, testing_utils_1.createFeatures)([])), {
+    await t.throwsAsync(async () => await codeqlObject.runAutobuild(stubConfig, languages_1.Language.java), {
        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, (0, testing_utils_1.createFeatures)([])), {
+    await t.throwsAsync(async () => await codeqlObject.runAutobuild(stubConfig, languages_1.Language.java), {
        instanceOf: cli_errors_1.CommandInvocationError,
        message: "We were unable to automatically build your code. Please provide manual build steps. " +
            "For more information, see " +
@@ -176,7 +176,7 @@ exports.getLanguages = getLanguages;
 * version of the CLI.
 */
 async function getLanguageAliases(codeql) {
-    if (await (0, util_1.codeQlVersionAbove)(codeql, codeql_1.CODEQL_VERSION_LANGUAGE_ALIASING)) {
+    if (await (0, util_1.codeQlVersionAtLeast)(codeql, codeql_1.CODEQL_VERSION_LANGUAGE_ALIASING)) {
        return (await codeql.betterResolveLanguages()).aliases;
    }
    return undefined;
@@ -36,8 +36,9 @@ async function uploadDatabases(repositoryNwo, config, apiDetails, logger) {
        return;
    }
    // Do nothing when not running against github.com
-    if (config.gitHubVersion.type !== util.GitHubVariant.DOTCOM) {
-        logger.debug("Not running against github.com. Skipping upload.");
+    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.");
        return;
    }
    if (!(await actionsUtil.isAnalyzingDefaultBranch())) {
@@ -47,6 +48,14 @@ 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.
@@ -58,7 +67,8 @@ 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 https://uploads.github.com/repos/:owner/:repo/code-scanning/codeql/databases/:language?name=:name&commit_oid=:commit_oid`, {
+                await client.request(`POST /repos/:owner/:repo/code-scanning/codeql/databases/:language?name=:name&commit_oid=:commit_oid`, {
+                    baseUrl: uploadsBaseUrl,
                    owner: repositoryNwo.owner,
                    repo: repositoryNwo.repo,
                    language,
@@ -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,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"}
+{"version":3,"file":"database-upload.js","sourceRoot":"","sources":["../src/database-upload.ts"],"names":[],"mappings":"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"}
@@ -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 https://uploads.github.com/repos/:owner/:repo/code-scanning/codeql/databases/:language?name=:name&commit_oid=:commit_oid";
+    const url = "POST /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,6 +66,7 @@ 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) => {
@@ -95,7 +96,8 @@ 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. Skipping upload.") !== undefined);
+            v.message ===
+                "Not running against github.com or GHEC-DR. Skipping upload.") !== undefined);
    });
 });
 (0, ava_1.default)("Abort database upload if not analyzing default branch", async (t) => {
@@ -133,7 +135,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 api.github.com", async (t) => {
+(0, ava_1.default)("Successfully uploading a database to github.com", async (t) => {
    await (0, util_1.withTmpDir)(async (tmpDir) => {
        (0, testing_utils_1.setupActionsVars)(tmpDir, tmpDir);
        sinon
@@ -153,7 +155,7 @@ async function mockHttpRequests(databaseUploadStatusCode) {
            v.message === "Successfully uploaded database for javascript") !== undefined);
    });
 });
-(0, ava_1.default)("Successfully uploading a database to uploads.github.com", async (t) => {
+(0, ava_1.default)("Successfully uploading a database to GHEC-DR", async (t) => {
    await (0, util_1.withTmpDir)(async (tmpDir) => {
        (0, testing_utils_1.setupActionsVars)(tmpDir, tmpDir);
        sinon
@@ -161,16 +163,21 @@ async function mockHttpRequests(databaseUploadStatusCode) {
            .withArgs("upload-database")
            .returns("true");
        sinon.stub(actionsUtil, "isAnalyzingDefaultBranch").resolves(true);
-        await mockHttpRequests(201);
+        const databaseUploadSpy = await mockHttpRequests(201);
        (0, codeql_1.setCodeQL)({
            async databaseBundle(_, outputFilePath) {
                fs.writeFileSync(outputFilePath, "");
            },
        });
        const loggedMessages = [];
-        await (0, database_upload_1.uploadDatabases)(testRepoName, getTestConfig(tmpDir), testApiDetails, (0, testing_utils_1.getRecordingLogger)(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));
        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
@@ -1,6 +1,6 @@
 {
-    "bundleVersion": "codeql-bundle-v2.17.0",
-    "cliVersion": "2.17.0",
-    "priorBundleVersion": "codeql-bundle-v2.16.5",
-    "priorCliVersion": "2.16.5"
+    "bundleVersion": "codeql-bundle-v2.17.2",
+    "cliVersion": "2.17.2",
+    "priorBundleVersion": "codeql-bundle-v2.17.1",
+    "priorCliVersion": "2.17.1"
 }
@@ -45,12 +45,11 @@ exports.CODEQL_VERSION_FINE_GRAINED_PARALLELISM = "2.15.1";
 /**
 * Feature enablement as returned by the GitHub API endpoint.
 *
- * Each value of this enum should end with `_enabled`.
+ * Legacy features should end with `_enabled`.
 */
 var Feature;
 (function (Feature) {
-    Feature["AutobuildDirectTracingEnabled"] = "autobuild_direct_tracing_enabled";
-    Feature["CliSarifMerge"] = "cli_sarif_merge_enabled";
+    Feature["AutobuildDirectTracing"] = "autobuild_direct_tracing";
    Feature["CppDependencyInstallation"] = "cpp_dependency_installation_enabled";
    Feature["CppTrapCachingEnabled"] = "cpp_trap_caching_enabled";
    Feature["DisableJavaBuildlessEnabled"] = "disable_java_buildless_enabled";
@@ -59,47 +58,47 @@ var Feature;
    Feature["QaTelemetryEnabled"] = "qa_telemetry_enabled";
 })(Feature || (exports.Feature = Feature = {}));
 exports.featureConfig = {
-    [Feature.AutobuildDirectTracingEnabled]: {
+    [Feature.AutobuildDirectTracing]: {
+        defaultValue: false,
        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]: {
-        envVar: "CODEQL_EXTRACTOR_CPP_AUTOINSTALL_DEPENDENCIES",
-        minimumVersion: "2.15.0",
        defaultValue: false,
+        envVar: "CODEQL_EXTRACTOR_CPP_AUTOINSTALL_DEPENDENCIES",
+        legacyApi: true,
+        minimumVersion: "2.15.0",
    },
    [Feature.CppTrapCachingEnabled]: {
-        envVar: "CODEQL_CPP_TRAP_CACHING",
-        minimumVersion: "2.16.1",
        defaultValue: false,
+        envVar: "CODEQL_CPP_TRAP_CACHING",
+        legacyApi: true,
+        minimumVersion: "2.16.1",
    },
    [Feature.DisableJavaBuildlessEnabled]: {
-        envVar: "CODEQL_ACTION_DISABLE_JAVA_BUILDLESS",
-        minimumVersion: undefined,
        defaultValue: false,
+        envVar: "CODEQL_ACTION_DISABLE_JAVA_BUILDLESS",
+        legacyApi: true,
+        minimumVersion: undefined,
    },
    [Feature.DisableKotlinAnalysisEnabled]: {
-        envVar: "CODEQL_DISABLE_KOTLIN_ANALYSIS",
-        minimumVersion: undefined,
        defaultValue: false,
+        envVar: "CODEQL_DISABLE_KOTLIN_ANALYSIS",
+        legacyApi: true,
+        minimumVersion: undefined,
    },
    [Feature.ExportDiagnosticsEnabled]: {
-        envVar: "CODEQL_ACTION_EXPORT_DIAGNOSTICS",
-        minimumVersion: undefined,
        defaultValue: true,
+        envVar: "CODEQL_ACTION_EXPORT_DIAGNOSTICS",
+        legacyApi: true,
+        minimumVersion: undefined,
    },
    [Feature.QaTelemetryEnabled]: {
-        envVar: "CODEQL_ACTION_QA_TELEMETRY",
-        minimumVersion: undefined,
        defaultValue: false,
+        envVar: "CODEQL_ACTION_QA_TELEMETRY",
+        legacyApi: true,
+        minimumVersion: undefined,
    },
 };
 exports.FEATURE_FLAGS_FILE_NAME = "cached-feature-flags.json";
@@ -144,7 +143,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.codeQlVersionAbove(codeql, minimumVersion))) {
+            if (!(await util.codeQlVersionAtLeast(codeql, minimumVersion))) {
                this.logger.debug(`Feature ${feature} is disabled because the CodeQL CLI version is older than the minimum ` +
                    `version ${minimumVersion}.`);
                return false;
@@ -315,13 +314,20 @@ 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: " +
-                `${JSON.stringify(remoteFlags)}`);
+            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.hasAccessedRemoteFeatureFlags = true;
            return remoteFlags;
        }
@@ -331,9 +331,18 @@ 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)("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'`);
+(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'`);
+        }
    }
 });
 function assertAllFeaturesUndefinedInApi(t, loggedMessages) {
@@ -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.codeQlVersionAbove)(codeql, "2.13.4")) &&
-            !(await (0, util_1.codeQlVersionAbove)(codeql, "2.14.4"))) {
+        if ((await (0, util_1.codeQlVersionAtLeast)(codeql, "2.13.4")) &&
+            !(await (0, util_1.codeQlVersionAtLeast)(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.codeQlVersionAbove)(codeql, "2.14.0")) &&
-            !(await (0, util_1.codeQlVersionAbove)(codeql, "2.14.4"))) {
+            (await (0, util_1.codeQlVersionAtLeast)(codeql, "2.14.0")) &&
+            !(await (0, util_1.codeQlVersionAtLeast)(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,17 +282,25 @@ 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.codeQlVersionAbove)(codeql, "2.17.1")) {
+        if (await (0, util_1.codeQlVersionAtLeast)(codeql, "2.17.1")) {
            // disabled by default, no warning
        }
-        else if (await (0, util_1.codeQlVersionAbove)(codeql, "2.16.0")) {
+        else if (await (0, util_1.codeQlVersionAtLeast)(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.codeQlVersionAbove)(codeql, "2.13.1")) {
+        else if (await (0, util_1.codeQlVersionAtLeast)(codeql, "2.13.1")) {
            core.exportVariable("CODEQL_EXTRACTOR_PYTHON_DISABLE_LIBRARY_EXTRACTION", "true");
        }
        else {
@@ -23,9 +23,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkInstallPython311 = exports.printPathFiltersWarning = exports.runInit = exports.initConfig = exports.initCodeQL = void 0;
+exports.isSipEnabled = 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");
@@ -89,4 +90,25 @@ 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
@@ -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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"}
@@ -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.codeQlVersionAbove(codeql, codeql_1.CODEQL_VERSION_LANGUAGE_ALIASING))) {
+    if (!(await util.codeQlVersionAtLeast(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.codeQlVersionAbove(codeql, codeql_1.CODEQL_VERSION_RESOLVE_ENVIRONMENT))) {
+    if (!(await util.codeQlVersionAtLeast(codeql, codeql_1.CODEQL_VERSION_RESOLVE_ENVIRONMENT))) {
        logger.warning("Unsupported CodeQL CLI version for `resolve build-environment` command, " +
            "returning an empty configuration.");
    }
@@ -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,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"}
+{"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"}
@@ -52,6 +52,7 @@ 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") {
@@ -222,7 +223,10 @@ async function findOverridingToolsInCache(humanReadableVersion, logger) {
    return undefined;
 }
 async function getCodeQLSource(toolsInput, defaultCliVersion, apiDetails, variant, logger) {
-    if (toolsInput && toolsInput !== "latest" && !toolsInput.startsWith("http")) {
+    if (toolsInput &&
+        !CODEQL_BUNDLE_VERSION_ALIAS.includes(toolsInput) &&
+        !toolsInput.startsWith("http")) {
+        logger.info(`Using CodeQL CLI from local path ${toolsInput}`);
        return {
            codeqlTarPath: toolsInput,
            sourceType: "local",
@@ -232,14 +236,21 @@ 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 'latest' to prioritize the version in `defaults.json` over the
+     * We use the special value of 'linked' 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 === "latest";
+    const forceShippedTools = toolsInput && CODEQL_BUNDLE_VERSION_ALIAS.includes(toolsInput);
    if (forceShippedTools) {
-        logger.info("Overriding the version of the CodeQL tools by the version shipped with the Action since " +
-            `"tools: latest" was requested.`);
+        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.");
+        }
    }
    /** CLI version number, for example 2.12.6. */
    let cliVersion;
@@ -329,6 +340,12 @@ 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",
@@ -349,6 +366,12 @@ 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,
@@ -373,7 +396,9 @@ async function tryGetFallbackToolcacheVersion(cliVersion, tagName, logger) {
    return fallbackVersion;
 }
 exports.tryGetFallbackToolcacheVersion = tryGetFallbackToolcacheVersion;
-async function downloadCodeQL(codeqlURL, maybeBundleVersion, maybeCliVersion, apiDetails, variant, tempDir, logger) {
+// 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) {
    const parsedCodeQLURL = new URL(codeqlURL);
    const searchParams = new URLSearchParams(parsedCodeQLURL.search);
    const headers = {
@@ -436,7 +461,7 @@ async function downloadCodeQL(codeqlURL, maybeBundleVersion, maybeCliVersion, ap
        codeqlFolder: toolcachedBundlePath,
        toolsDownloadDurationMs,
    };
-}
+};
 exports.downloadCodeQL = downloadCodeQL;
 function getCodeQLURLVersion(url) {
    const match = url.match(/\/codeql-bundle-(.*)\//);
@@ -503,7 +528,7 @@ async function setupCodeQLBundle(toolsInput, apiDetails, tempDir, variant, defau
            toolsSource = ToolsSource.Toolcache;
            break;
        case "download": {
-            const result = await downloadCodeQL(source.codeqlURL, source.bundleVersion, source.cliVersion, apiDetails, variant, tempDir, logger);
+            const result = await (0, exports.downloadCodeQL)(source.codeqlURL, source.bundleVersion, source.cliVersion, apiDetails, variant, tempDir, logger);
            toolsVersion = result.toolsVersion;
            codeqlFolder = result.codeqlFolder;
            toolsDownloadDurationMs = result.toolsDownloadDurationMs;
@@ -84,4 +84,74 @@ 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
@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createTestConfig = exports.mockBundleDownloadApi = exports.createFeatures = exports.mockCodeQLVersion = exports.makeVersionInfo = exports.mockLanguagesInRepo = exports.mockFeatureFlagApiEndpoint = exports.getRecordingLogger = exports.setupActionsVars = exports.setupTests = exports.SAMPLE_DEFAULT_CLI_VERSION = exports.SAMPLE_DOTCOM_API_DETAILS = void 0;
+exports.createTestConfig = exports.mockBundleDownloadApi = exports.createFeatures = exports.mockCodeQLVersion = exports.makeVersionInfo = exports.mockLanguagesInRepo = exports.mockFeatureFlagApiEndpoint = exports.getRecordingLogger = exports.setupActionsVars = exports.setupTests = exports.LINKED_CLI_VERSION = exports.SAMPLE_DEFAULT_CLI_VERSION = exports.SAMPLE_DOTCOM_API_DETAILS = void 0;
 const node_util_1 = require("node:util");
 const path_1 = __importDefault(require("path"));
 const github = __importStar(require("@actions/github"));
@@ -34,6 +34,7 @@ const nock_1 = __importDefault(require("nock"));
 const sinon = __importStar(require("sinon"));
 const apiClient = __importStar(require("./api-client"));
 const codeql = __importStar(require("./codeql"));
+const defaults = __importStar(require("./defaults.json"));
 const util_1 = require("./util");
 exports.SAMPLE_DOTCOM_API_DETAILS = {
    auth: "token",
@@ -44,6 +45,10 @@ exports.SAMPLE_DEFAULT_CLI_VERSION = {
    cliVersion: "2.20.0",
    tagName: "codeql-bundle-v2.20.0",
 };
+exports.LINKED_CLI_VERSION = {
+    cliVersion: defaults.cliVersion,
+    tagName: defaults.bundleVersion,
+};
 function wrapOutput(context) {
    // Function signature taken from Socket.write.
    // Note there are two overloads:
@@ -33,13 +33,23 @@ const util_1 = require("./util");
 async function shouldEnableIndirectTracing(codeql, config, features) {
    return ((!config.buildMode ||
        config.buildMode === util_1.BuildMode.Manual ||
-        !(await features.getValue(feature_flags_1.Feature.AutobuildDirectTracingEnabled, codeql))) &&
+        !(await features.getValue(feature_flags_1.Feature.AutobuildDirectTracing, codeql))) &&
        config.languages.some((l) => (0, languages_1.isTracedLanguage)(l)));
 }
 exports.shouldEnableIndirectTracing = shouldEnableIndirectTracing;
-async function endTracingForCluster(codeql, config, features) {
+/**
+ * Delete variables as specified by the end-tracing script
+ *
+ * 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 current build step.
+ */
+async function endTracingForCluster(codeql, config, logger, features) {
    if (!(await shouldEnableIndirectTracing(codeql, config, features)))
        return;
+    logger.info("Unsetting build tracing environment variables. Subsequent steps of this job will not be traced.");
    const envVariablesFile = path.resolve(config.dbLocation, "temp/tracingEnvironment/end-tracing.json");
    if (!fs.existsSync(envVariablesFile)) {
        throw new Error(`Environment file for ending tracing not found: ${envVariablesFile}`);
@@ -1 +1 @@
-{"version":3,"file":"tracer-config.js","sourceRoot":"","sources":["../src/tracer-config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tracer-config.js","sourceRoot":"","sources":["../src/tracer-config.ts"],"names":[],"mappings":"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"}
@@ -26,13 +26,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InvalidSarifUploadError = exports.validateUniqueCategory = exports.waitForProcessing = exports.buildPayload = exports.validateSarifFileSchema = exports.uploadFromActions = exports.findSarifFilesInDir = exports.populateRunAutomationDetails = void 0;
+exports.InvalidSarifUploadError = exports.validateUniqueCategory = exports.waitForProcessing = exports.buildPayload = exports.validateSarifFileSchema = exports.uploadFromActions = exports.findSarifFilesInDir = exports.populateRunAutomationDetails = exports.shouldShowCombineSarifFilesDeprecationWarning = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const zlib_1 = __importDefault(require("zlib"));
 const core = __importStar(require("@actions/core"));
 const file_url_1 = __importDefault(require("file-url"));
 const jsonschema = __importStar(require("jsonschema"));
+const semver = __importStar(require("semver"));
 const actionsUtil = __importStar(require("./actions-util"));
 const actions_util_1 = require("./actions-util");
 const api = __importStar(require("./api-client"));
@@ -73,14 +74,55 @@ function combineSarifFiles(sarifFiles, logger) {
 }
 /**
 * Checks whether all the runs in the given SARIF files were produced by CodeQL.
- * @param sarifFiles The list of SARIF files to check.
+ * @param sarifObjects The list of SARIF objects to check.
 */
-function areAllRunsProducedByCodeQL(sarifFiles) {
-    return sarifFiles.every((sarifFile) => {
-        const sarifObject = JSON.parse(fs.readFileSync(sarifFile, "utf8"));
+function areAllRunsProducedByCodeQL(sarifObjects) {
+    return sarifObjects.every((sarifObject) => {
        return sarifObject.runs?.every((run) => run.tool?.driver?.name === "CodeQL");
    });
 }
+function createRunKey(run) {
+    return {
+        name: run.tool?.driver?.name,
+        fullName: run.tool?.driver?.fullName,
+        version: run.tool?.driver?.version,
+        semanticVersion: run.tool?.driver?.semanticVersion,
+        guid: run.tool?.driver?.guid,
+        automationId: run.automationDetails?.id,
+    };
+}
+/**
+ * Checks whether all runs in the given SARIF files are unique (based on the
+ * criteria used by Code Scanning to determine analysis categories).
+ * @param sarifObjects The list of SARIF objects to check.
+ */
+function areAllRunsUnique(sarifObjects) {
+    const keys = new Set();
+    for (const sarifObject of sarifObjects) {
+        for (const run of sarifObject.runs) {
+            const key = JSON.stringify(createRunKey(run));
+            // If the key already exists, the runs are not unique.
+            if (keys.has(key)) {
+                return false;
+            }
+            keys.add(key);
+        }
+    }
+    return true;
+}
+// Checks whether the deprecation warning for combining SARIF files should be shown.
+async function shouldShowCombineSarifFilesDeprecationWarning(sarifObjects, githubVersion) {
+    // Do not show this warning on GHES versions before 3.14.0
+    if (githubVersion.type === util_1.GitHubVariant.GHES &&
+        semver.lt(githubVersion.version, "3.14.0")) {
+        return false;
+    }
+    // Only give a deprecation warning when not all runs are unique and
+    // we haven't already shown the warning.
+    return (!areAllRunsUnique(sarifObjects) &&
+        !process.env.CODEQL_MERGE_SARIF_DEPRECATION_WARNING);
+}
+exports.shouldShowCombineSarifFilesDeprecationWarning = shouldShowCombineSarifFilesDeprecationWarning;
 // Takes a list of paths to sarif files and combines them together using the
 // CLI `github merge-results` command when all SARIF files are produced by
 // CodeQL. Otherwise, it will fall back to combining the files in the action.
@@ -90,8 +132,19 @@ async function combineSarifFilesUsingCLI(sarifFiles, gitHubVersion, features, lo
    if (sarifFiles.length === 1) {
        return JSON.parse(fs.readFileSync(sarifFiles[0], "utf8"));
    }
-    if (!areAllRunsProducedByCodeQL(sarifFiles)) {
+    const sarifObjects = sarifFiles.map((sarifFile) => {
+        return JSON.parse(fs.readFileSync(sarifFile, "utf8"));
+    });
+    const deprecationWarningMessage = gitHubVersion.type === util_1.GitHubVariant.GHES
+        ? "and will be removed in GitHub Enterprise Server 3.18"
+        : "and will be removed on June 4, 2025";
+    const deprecationMoreInformationMessage = "For more information, see https://github.blog/changelog/2024-05-06-code-scanning-will-stop-combining-runs-from-a-single-upload";
+    if (!areAllRunsProducedByCodeQL(sarifObjects)) {
        logger.debug("Not all SARIF files were produced by CodeQL. Merging files in the action.");
+        if (await shouldShowCombineSarifFilesDeprecationWarning(sarifObjects, gitHubVersion)) {
+            logger.warning(`Uploading multiple SARIF runs with the same category is deprecated ${deprecationWarningMessage}. Please update your workflow to upload a single run per category. ${deprecationMoreInformationMessage}`);
+            core.exportVariable("CODEQL_MERGE_SARIF_DEPRECATION_WARNING", "true");
+        }
        // If not, use the naive method of combining the files.
        return combineSarifFiles(sarifFiles, logger);
    }
@@ -119,6 +172,10 @@ async function combineSarifFilesUsingCLI(sarifFiles, gitHubVersion, features, lo
    }
    if (!(await codeQL.supportsFeature(tools_features_1.ToolsFeature.SarifMergeRunsFromEqualCategory))) {
        logger.warning("The CodeQL CLI does not support merging SARIF files. Merging files in the action.");
+        if (await shouldShowCombineSarifFilesDeprecationWarning(sarifObjects, gitHubVersion)) {
+            logger.warning(`Uploading multiple CodeQL runs with the same category is deprecated ${deprecationWarningMessage} for CodeQL CLI 2.16.6 and earlier. Please update your CodeQL CLI version or update your workflow to set a distinct category for each CodeQL run. ${deprecationMoreInformationMessage}`);
+            core.exportVariable("CODEQL_MERGE_SARIF_DEPRECATION_WARNING", "true");
+        }
        return combineSarifFiles(sarifFiles, logger);
    }
    const baseTempDir = path.resolve(tempDir, "combined-sarif");
@@ -341,9 +398,7 @@ async function uploadFiles(sarifFiles, repositoryNwo, commitOid, ref, analysisKe
    for (const file of sarifFiles) {
        validateSarifFileSchema(file, logger);
    }
-    let sarif = (await features.getValue(feature_flags_1.Feature.CliSarifMerge))
-        ? await combineSarifFilesUsingCLI(sarifFiles, gitHubVersion, features, logger)
-        : combineSarifFiles(sarifFiles, logger);
+    let sarif = await combineSarifFilesUsingCLI(sarifFiles, gitHubVersion, features, logger);
    sarif = await fingerprints.addFingerprints(sarif, sourceRoot, logger);
    sarif = populateRunAutomationDetails(sarif, category, analysisKey, environment);
    const toolNames = util.getToolNames(sarif);
@@ -462,6 +517,8 @@ function shouldConsiderConfigurationError(processingErrors) {
 */
 function shouldConsiderInvalidRequest(processingErrors) {
    return processingErrors.every((error) => error.startsWith("rejecting SARIF") ||
+        error.startsWith("an invalid URI was provided as a SARIF location") ||
+        error.startsWith("locationFromSarifResult: expected artifact location") ||
        error.startsWith("could not convert rules: invalid security severity value, is not a number") ||
        /^SARIF URI scheme [^\s]* did not match the checkout URI scheme [^\s]*/.test(error));
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Koen Vlaswinkel	a57c67b895	Merge pull request #2286 from github/koesie10/ghec-dr-db-upload Enable database uploads for GHEC-DR	2024-05-15 14:49:47 +02:00
Henry Mercer	b7ef64ecb1	Merge pull request #2294 from github/dependabot/npm_and_yarn/npm-d3285d5234 Bump the npm group across 1 directory with 4 updates	2024-05-15 13:48:49 +01:00
github-actions[bot]	e54dea297a	Update checked-in dependencies	2024-05-15 09:38:11 +00:00
dependabot[bot]	3b42294f03	Bump the npm group across 1 directory with 4 updates Bumps the npm group with 4 updates in the / directory: [@octokit/types](https://github.com/octokit/types.ts), [semver](https://github.com/npm/node-semver), [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) and [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser). Updates `@octokit/types` from 13.4.1 to 13.5.0 - [Release notes](https://github.com/octokit/types.ts/releases) - [Commits](https://github.com/octokit/types.ts/compare/v13.4.1...v13.5.0) Updates `semver` from 7.6.0 to 7.6.2 - [Release notes](https://github.com/npm/node-semver/releases) - [Changelog](https://github.com/npm/node-semver/blob/main/CHANGELOG.md) - [Commits](https://github.com/npm/node-semver/compare/v7.6.0...v7.6.2) Updates `@typescript-eslint/eslint-plugin` from 7.8.0 to 7.9.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/v7.9.0/packages/eslint-plugin) Updates `@typescript-eslint/parser` from 7.8.0 to 7.9.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/v7.9.0/packages/parser) --- updated-dependencies: - dependency-name: "@octokit/types" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: npm - dependency-name: semver dependency-type: direct:production update-type: version-update:semver-patch 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 ... Signed-off-by: dependabot[bot] <support@github.com>	2024-05-15 09:37:09 +00:00
Koen Vlaswinkel	7fd4900b29	Merge pull request #2292 from github/koesie10/remove-combine-sarif-files-deprecation-warning-ff Remove feature flag for combine SARIF files deprecation warning	2024-05-14 11:43:12 +02:00
Koen Vlaswinkel	931fabe1ef	Remove feature flag for combine SARIF files deprecation warning	2024-05-14 11:00:12 +02:00
Koen Vlaswinkel	24766fcf56	Fix trailing slash on uploads URL	2024-05-13 16:31:17 +02:00
Fotis Koutoulakis	08487dbb93	Merge pull request #2284 from github/NlightNFotis/add_tools_help Add documentation for the `tools` option in the various workflow files	2024-05-13 15:07:53 +01:00
Fotis Koutoulakis	5a14b059c3	Merge pull request #2281 from github/tools_latest_improvement Add option `tools: linked` for `tools` input of init action.	2024-05-13 15:07:00 +01:00
Fotis Koutoulakis (@NlightNFotis)	df4819e3a1	Soften deprecation message wording and remove unhelpful version strings from some locations	2024-05-13 14:51:06 +01:00
Fotis Koutoulakis (@NlightNFotis)	bcc13653e8	Move logging messages to downstream function and add deprecation notice	2024-05-13 14:51:06 +01:00
Fotis Koutoulakis (@NlightNFotis)	1796f5474f	Add new input option `tools: linked` to CHANGELOG	2024-05-13 14:51:06 +01:00
Fotis Koutoulakis (@NlightNFotis)	4522b08a7e	[SYNC] Sync files in lib/ as requested by CI check that is failing	2024-05-13 14:51:06 +01:00
Fotis Koutoulakis (@NlightNFotis)	998a4c720d	Change overriding log message to make default version more explicit.	2024-05-13 14:51:06 +01:00
Fotis Koutoulakis (@NlightNFotis)	c92bbd4223	Add test for CodeQL version appearing in log.	2024-05-13 14:51:06 +01:00
Fotis Koutoulakis (@NlightNFotis)	cff15d7117	Add logging for CodeQL CLI Version and add tests to the logger for it.	2024-05-13 14:51:06 +01:00
Fotis Koutoulakis (@NlightNFotis)	cbe408dfc9	Add option `tools: linked` for init action. Also ensure that option latest remains compatible, and add tests for the two options.	2024-05-13 14:51:06 +01:00
Henry Mercer	bf2faab135	Merge pull request #2288 from github/mergeback/v3.25.5-to-main-b7cec752 Mergeback v3.25.5 refs/heads/releases/v3 into main	2024-05-13 14:43:58 +01:00
github-actions[bot]	32f554ea7c	Update checked-in dependencies	2024-05-13 13:25:49 +00:00
github-actions[bot]	9f6ef11db1	Update changelog and version after v3.25.5	2024-05-13 13:01:34 +00:00
Henry Mercer	b7cec75265	Merge pull request #2287 from github/update-v3.25.5-4a5197247 Merge main into releases/v3	2024-05-13 14:00:26 +01:00
Koen Vlaswinkel	90e315a7a8	Update tests for GHEC-DR	2024-05-13 14:09:58 +02:00
github-actions[bot]	6778fe4553	Update changelog for v3.25.5	2024-05-13 11:58:52 +00:00
Koen Vlaswinkel	bc3670a4f4	Enable database uploads for GHEC-DR	2024-05-13 13:27:07 +02:00
Fotis Koutoulakis (@NlightNFotis)	4f59156fc8	Improve wording on internal workflows and add clarification for tools input in the description.	2024-05-13 10:46:04 +01:00
Fotis Koutoulakis	eb4969f5e2	Clarify wording Co-authored-by: Henry Mercer <henrymercer@github.com>	2024-05-10 18:03:16 +01:00
Henry Mercer	4a51972477	Merge pull request #2280 from github/henrymercer/on-demand-ffs Add support for on-demand feature flags	2024-05-10 17:37:57 +01:00
Henry Mercer	a8c32fd278	Merge pull request #2283 from github/henrymercer/disable-fail-fast Disable `fail-fast` for PR checks	2024-05-10 17:28:04 +01:00
Fotis Koutoulakis (@NlightNFotis)	6182f337aa	Add documentation for the tools option in the various workflow files	2024-05-10 16:57:20 +01:00
Henry Mercer	f73b0b70eb	Disable fail fast for non-generated workflows	2024-05-10 16:27:12 +01:00
Henry Mercer	c59e05245f	Disable fail fast in generated workflows	2024-05-10 16:24:22 +01:00
Henry Mercer	33e416c056	Comment that `legacyApi` is false by default	2024-05-10 11:35:55 +01:00
Henry Mercer	67f8a36bdb	Merge branch 'main' into henrymercer/on-demand-ffs	2024-05-10 11:32:35 +01:00
Henry Mercer	4995c49010	Merge pull request #2282 from github/henrymercer/no-build-mode-tracing-improvements End tracing in autobuild Action for workflows that don't specify a build mode	2024-05-10 10:15:24 +01:00
Andrew Eisenberg	def4d2cd4e	Merge pull request #2273 from github/aeisenberg/specify-versions Add a compatibility table to the README	2024-05-09 08:12:59 -07:00
Henry Mercer	5ac5c91bc1	End tracing early in autobuild Action for improved performance and reliability This lets us achieve some performance and reliability improvements for workflows that run autobuild directly without specifying a build mode.	2024-05-09 15:06:36 +01:00
Henry Mercer	7a6352f8e6	Don't call `trace-command` when the indirect tracer has already been started	2024-05-09 14:25:25 +01:00
Henry Mercer	cf4c3b4434	Remove "_enabled" suffix from non-legacy features	2024-05-09 12:38:10 +01:00
Henry Mercer	9dc84e9abe	Log feature flags on separate lines in debug mode This prevents them from being truncated.	2024-05-09 12:38:10 +01:00
Henry Mercer	c49579ba44	Add support for on-demand feature flags	2024-05-09 11:42:38 +01:00
Andrew Eisenberg	d23427596b	Move changelog notes to proper section	2024-05-08 11:46:40 -07:00
Andrew Eisenberg	9fba755525	Merge branch 'main' into aeisenberg/specify-versions	2024-05-08 11:45:08 -07:00
Andrew Eisenberg	43beef629f	Update README.md Co-authored-by: Henry Mercer <henrymercer@github.com>	2024-05-08 11:44:51 -07:00
Andrew Eisenberg	7d9b7a1870	Merge pull request #2274 from github/aeisenberg/no-warn-workflow_call Avoid warning on workflow_call triggers	2024-05-08 11:43:37 -07:00
Henry Mercer	715d348a99	Merge pull request #2277 from github/henrymercer/more-user-errors Add more user errors	2024-05-08 18:49:21 +01:00
Henry Mercer	7aff39e921	Merge pull request #2279 from github/henrymercer/python-3.12 Run release process using Python 3.12	2024-05-08 17:24:19 +01:00
Henry Mercer	e36d338969	Merge pull request #2276 from github/mergeback/v3.25.4-to-main-ccf74c94 Mergeback v3.25.4 refs/heads/releases/v3 into main	2024-05-08 15:08:20 +01:00
Henry Mercer	2c25369331	Run release process using Python 3.12	2024-05-08 13:49:53 +01:00
github-actions[bot]	65c9ae9352	Update checked-in dependencies	2024-05-08 12:40:10 +00:00
Henry Mercer	b1c3187939	Add more invalid SARIF processing errors	2024-05-08 13:36:10 +01:00
github-actions[bot]	a21528bb71	Update changelog and version after v3.25.4	2024-05-08 12:31:39 +00:00
Henry Mercer	ccf74c9479	Merge pull request #2275 from github/update-v3.25.4-4b812a5df Merge main into releases/v3	2024-05-08 13:30:22 +01:00
Henry Mercer	45fb58ab31	Add user error for gracefully running out of memory As opposed to being killed by the JVM, which is a failure not a user error.	2024-05-08 13:21:19 +01:00
Henry Mercer	ec1179000d	Add user error for "Pack cannot be found"	2024-05-08 13:20:03 +01:00
github-actions[bot]	4fdf4ac628	Update changelog for v3.25.4	2024-05-08 11:29:41 +00:00
Andrew Eisenberg	e50fb8fff0	Add a compatibility table to the README Specifies the versions of the action, CLI and GHES that are jointly compatible.	2024-05-07 13:58:01 -07:00
Andrew Eisenberg	ca7f194e36	Avoid warning on workflow_call triggers Typically, we warn when there is no `push` trigger in the workflow file that triggered this run. However, when this action is triggered by a `workflow_call` event, we assume there is a custom process for triggering the action and we don't want to warn in this case.	2024-05-07 13:30:06 -07:00
Henry Mercer	4b812a5dff	Merge pull request #2270 from github/update-bundle/codeql-bundle-v2.17.2 Update default bundle to 2.17.2	2024-05-07 12:13:33 +01:00
Marco Gario	1e21373a75	Merge pull request #2272 from github/marcogario-patch-1 Fix broken link to deprecation changelog	2024-05-06 21:07:46 +02:00
Marco Gario	4673d41da1	Build js files	2024-05-06 18:44:55 +00:00
Marco Gario	65297ef0b0	Update link to deprecation changelog	2024-05-06 20:39:22 +02:00
Koen Vlaswinkel	84d6ead480	Merge pull request #2271 from github/koesie10/remove-cli-sarif-merge-ff Remove CLI SARIF merge feature flag	2024-05-03 16:40:46 +02:00
Koen Vlaswinkel	b20bf5914d	Remove CLI SARIF merge feature flag	2024-05-03 15:14:12 +02:00
Koen Vlaswinkel	93b8232a39	Merge pull request #2265 from github/koesie10/deprecate-merge Add deprecation warning for merging SARIF files with non-unique categories	2024-05-03 10:23:10 +02:00
github-actions[bot]	ee63da2847	Add changelog note	2024-05-02 20:40:31 +00:00
github-actions[bot]	e62cc70a8b	Update default bundle to codeql-bundle-v2.17.2	2024-05-02 20:40:26 +00:00
Koen Vlaswinkel	5d274be858	Update CodeQL deprecation message	2024-05-02 14:02:42 +02:00
Koen Vlaswinkel	3a471a06fa	Update comment	2024-05-02 14:01:44 +02:00
Koen Vlaswinkel	725ed4139d	Add tests for shouldShowCombineSarifFilesDeprecationWarning	2024-05-02 10:20:11 +02:00
Koen Vlaswinkel	1de9b371a1	Clarify name of function	2024-05-02 10:01:11 +02:00
Koen Vlaswinkel	757fcd3d21	Remove unnecessary optional chaining	2024-05-02 10:00:29 +02:00
Koen Vlaswinkel	40f70f96b1	Extract more information message	2024-05-02 09:59:52 +02:00
Angela P Wen	41857bab35	Textually replace CodeQL version in `package.json` (#2269 ) Textually replace CodeQL version in `package.json` instead of using `npm version`, which occasionally fails due to merge conflicts that arise in the `package.json` process. Co-authored-by: Henry Mercer <henrymercer@github.com>	2024-05-01 10:10:05 -07:00
Angela P Wen	8fcfedf570	Merge pull request #2267 from github/dependabot/npm_and_yarn/npm-4c62fc25ba Bump the npm group with 2 updates	2024-04-29 14:28:29 -07:00
github-actions[bot]	c2eaf8a4f9	Update checked-in dependencies	2024-04-29 18:16:17 +00:00
dependabot[bot]	a17ed37616	Bump the npm group with 2 updates Bumps the npm group with 2 updates: [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) and [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser). Updates `@typescript-eslint/eslint-plugin` from 7.7.1 to 7.8.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/v7.8.0/packages/eslint-plugin) Updates `@typescript-eslint/parser` from 7.7.1 to 7.8.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/v7.8.0/packages/parser) --- updated-dependencies: - 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 ... Signed-off-by: dependabot[bot] <support@github.com>	2024-04-29 18:15:09 +00:00
Koen Vlaswinkel	b3225af51b	Mention GHES 3.18 as removal version on GHES	2024-04-26 14:38:20 +02:00
Koen Vlaswinkel	905f9b0083	Only show deprecation warning on GHES 3.14+	2024-04-26 14:38:06 +02:00
Koen Vlaswinkel	80394dcc32	Hide deprecation warning if feature flag is not set	2024-04-26 14:37:27 +02:00
Koen Vlaswinkel	7c29971135	Add combine_sarif_files_deprecation_warning_enabled feature flag	2024-04-26 14:36:55 +02:00
Koen Vlaswinkel	a5e49d1544	Extract check for combine SARIF files deprecation warning	2024-04-26 14:36:54 +02:00
Koen Vlaswinkel	24acd7711e	Set correct changelog URL	2024-04-26 14:23:51 +02:00
Koen Vlaswinkel	8b0dfa84c7	Add deprecation warning for merging SARIF files with non-unique categories	2024-04-26 14:22:30 +02:00
Angela P Wen	4ebadbc746	Merge pull request #2263 from github/mergeback/v3.25.3-to-main-d39d31e6 Mergeback v3.25.3 refs/heads/releases/v3 into main	2024-04-25 16:25:19 -07:00
github-actions[bot]	5af22f0433	Update checked-in dependencies	2024-04-25 23:05:16 +00:00
github-actions[bot]	c01f016188	Update changelog and version after v3.25.3	2024-04-25 23:04:23 +00:00
Angela P Wen	d39d31e687	Merge pull request #2262 from github/update-v3.25.3-ac2f82a1f Merge main into releases/v3	2024-04-25 16:02:51 -07:00
Angela P Wen	a7278252c7	Move changenote to most recent section	2024-04-25 15:45:34 -07:00
github-actions[bot]	1efa8597b1	Update changelog for v3.25.3	2024-04-25 22:40:19 +00:00
Angela P Wen	ac2f82a1ff	Log warning if SIP is disabled and CLI version is < 2.15.1 (#2261 ) * PR Checks: use `macos-12` runners for CLI v. < 2.15.1 Prior to CLI v2.15.1, MacOS ARM runners were not supported by the build tracer. "macos-latest" is now an ARM runner, so we run these tests on the old CLIs on Intel runners instead. * Log a warning if SIP is disabled and CLI is < 2.15.1 * Add changenote for SIP-disabled support on old CLI versions * Set up Python 3.11 for all MacOS checks	2024-04-25 22:20:13 +00:00
Alexander Eyers-Taylor	0ad7791640	Merge pull request #2247 from github/update-bundle/codeql-bundle-v2.17.1 Update default bundle to 2.17.1	2024-04-24 16:50:24 +01:00
Alexander Eyers-Taylor	79d9ee7f07	Merge branch 'main' into update-bundle/codeql-bundle-v2.17.1	2024-04-24 16:33:51 +01:00
Andrew Eisenberg	dbf2b1706b	Merge pull request #2255 from github/mergeback/v3.25.2-to-main-8f596b4a Mergeback v3.25.2 refs/heads/releases/v3 into main	2024-04-23 03:55:34 -07:00
github-actions[bot]	ff6a3c42a5	Update checked-in dependencies	2024-04-22 20:38:42 +00:00
github-actions[bot]	619dc0c4b8	Update changelog and version after v3.25.2	2024-04-22 20:35:09 +00:00
github-actions[bot]	39e1e6509e	Add changelog note	2024-04-17 10:06:44 +00:00
github-actions[bot]	501f5f5716	Update default bundle to codeql-bundle-v2.17.1	2024-04-17 10:06:36 +00:00