Updating

.eslintignore

@@ -0,0 +1,4 @@
+**/webpack.config.js
+lib/**
+src/testdata/**
+tests/**

.eslintrc.json

@@ -0,0 +1,77 @@
+
+{
+    "parser": "@typescript-eslint/parser",
+    "parserOptions": {
+        "project": "./tsconfig.json"
+    },
+    "plugins": ["@typescript-eslint", "filenames", "github", "import", "no-async-foreach"],
+    "extends": [
+        "eslint:recommended",
+        "plugin:@typescript-eslint/recommended",
+        "plugin:@typescript-eslint/recommended-requiring-type-checking",
+        "plugin:github/recommended",
+        "plugin:github/typescript",
+        "plugin:import/typescript"
+    ],
+    "rules": {
+        "filenames/match-regex": ["error", "^[a-z0-9-]+(\\.test)?$"],
+        "i18n-text/no-en": "off",
+        "import/extensions": ["error", {
+            // Allow importing JSON files
+            "json": {}
+        }],
+        "import/no-amd": "error",
+        "import/no-commonjs": "error",
+        "import/no-cycle": "error",
+        "import/no-dynamic-require": "error",
+        // Disable the rule that checks that devDependencies aren't imported since we use a single
+        // linting configuration file for both source and test code.
+        "import/no-extraneous-dependencies": ["error", {"devDependencies": true}],
+        "import/no-namespace": "off",
+        "import/no-unresolved": "error",
+        "import/no-webpack-loader-syntax": "error",
+        "import/order": ["error", {
+            "alphabetize": {"order": "asc"},
+            "newlines-between": "always"
+        }],
+        "max-len": ["error", {
+            "code": 120,
+            "ignoreUrls": true,
+            "ignoreStrings": true,
+            "ignoreTemplateLiterals": true
+        }],
+        "no-async-foreach/no-async-foreach": "error",
+        "no-console": "off",
+        "no-sequences": "error",
+        "no-shadow": "off",
+        "@typescript-eslint/no-shadow": ["error"],
+        "one-var": ["error", "never"]
+    },
+    "overrides": [{
+        // "temporarily downgraded during transition to eslint
+        "files": "**",
+        "rules": {
+            "@typescript-eslint/ban-types": "off",
+            "@typescript-eslint/explicit-module-boundary-types": "off",
+            "@typescript-eslint/no-explicit-any": "off",
+            "@typescript-eslint/no-unsafe-assignment": "off",
+            "@typescript-eslint/no-unsafe-call": "off",
+            "@typescript-eslint/no-unsafe-member-access": "off",
+            "@typescript-eslint/no-unsafe-return": "off",
+            "@typescript-eslint/no-var-requires": "off",
+            "@typescript-eslint/prefer-regexp-exec": "off",
+            "@typescript-eslint/require-await": "off",
+            "@typescript-eslint/restrict-template-expressions": "off",
+            "func-style": "off",
+            "sort-imports": "off"
+        }
+    }],
+    "settings": {
+        "import/resolver": {
+            "node": {
+                "moduleDirectory": ["node_modules", "src"]
+            },
+            "typescript": {}
+        }
+    }
+}

.github/actions/check-codescanning-config/action.yml

@@ -29,16 +29,7 @@ inputs:
   tools:
     required: true
     description: |
-      The version of CodeQL passed to the `tools` input of the init action.
+      The url of codeql to use.
-      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
@@ -61,12 +52,11 @@ runs:
     - name: Check config
       working-directory: ${{ github.action_path }}
       shell: bash
-      env:
+      run: ts-node ./index.ts "${{ runner.temp }}/user-config.yaml" '${{ inputs.expected-config-file-contents }}'
-        EXPECTED_CONFIG_FILE_CONTENTS: '${{ inputs.expected-config-file-contents }}'
+
-      run: ts-node ./index.ts "$RUNNER_TEMP/user-config.yaml" "$EXPECTED_CONFIG_FILE_CONTENTS"
     - name: Clean up
       shell: bash
       if: always()
       run: |
-        rm -rf $RUNNER_TEMP/codescanning-config-cli-test
+        rm -rf ${{ runner.temp }}/codescanning-config-cli-test
-        rm -rf $RUNNER_TEMP/user-config.yaml
+        rm -rf ${{ runner.temp }}/user-config.yaml

.github/actions/check-codescanning-config/index.ts

@@ -8,7 +8,7 @@ const actualConfig = loadActualConfig()
 
 const rawExpectedConfig = process.argv[3].trim()
 if (!rawExpectedConfig) {
-  core.setFailed('No expected configuration provided')
+  core.info('No expected configuration provided')
 } else {
   core.startGroup('Expected generated user config')
   core.info(yaml.dump(JSON.parse(rawExpectedConfig)))

.github/actions/check-sarif/action.yml

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

.github/actions/prepare-test/action.yml

@@ -2,16 +2,12 @@ name: "Prepare test"
 description: Performs some preparation to run tests
 inputs:
   version:
-    description: "The version of the CodeQL CLI to use. Can be 'linked', 'default', 'nightly-latest', 'nightly-YYYYMMDD', or 'stable-vX.Y.Z"
+    description: "The version of the CodeQL CLI to use. Can be 'latest', 'default', 'nightly-latest', 'nightly-YYYY-MM-DD', or 'stable-YYYY-MM-DD'."
     required: true
   use-all-platform-bundle:
     description: "If true, we output a tools URL with codeql-bundle.tar.gz file rather than platform-specific URL"
     default: 'false'
     required: false
-  setup-kotlin:
-    description: "If true, we setup kotlin"
-    default: 'true'
-    required: true
 outputs:
   tools-url:
     description: "The value that should be passed as the 'tools' input of the 'init' step."
@@ -29,54 +25,36 @@ runs:
     - id: get-url
       name: Determine URL
       shell: bash
-      env:
-        VERSION: ${{ inputs.version }}
-        USE_ALL_PLATFORM_BUNDLE: ${{ inputs.use-all-platform-bundle }}
       run: |
         set -e # Fail this Action if `gh release list` fails.
 
-        if [[ "$VERSION" == "linked" ]]; then
+        if [[ ${{ inputs.use-all-platform-bundle }} == "true" ]]; then
-          echo "tools-url=linked" >> "$GITHUB_OUTPUT"
+          artifact_name="codeql-bundle.tar.gz"
-          exit 0
-        elif [[ "$VERSION" == "default" ]]; then
-          echo "tools-url=" >> "$GITHUB_OUTPUT"
-          exit 0
-        fi
-
-        if [[ "$VERSION" == "nightly-latest" && "$RUNNER_OS" != "Windows" ]]; then
-          extension="tar.zst"
-        else
-          extension="tar.gz"
-        fi
-
-        if [[ "$USE_ALL_PLATFORM_BUNDLE" == "true" ]]; then
-          artifact_name="codeql-bundle.$extension"
         elif [[ "$RUNNER_OS" == "Linux" ]]; then
-          artifact_name="codeql-bundle-linux64.$extension"
+          artifact_name="codeql-bundle-linux64.tar.gz"
         elif [[ "$RUNNER_OS" == "macOS" ]]; then
-          artifact_name="codeql-bundle-osx64.$extension"
+          artifact_name="codeql-bundle-osx64.tar.gz"
         elif [[ "$RUNNER_OS" == "Windows" ]]; then
-          artifact_name="codeql-bundle-win64.$extension"
+          artifact_name="codeql-bundle-win64.tar.gz"
         else
           echo "::error::Unrecognized OS $RUNNER_OS"
           exit 1
         fi
 
-        if [[ "$VERSION" == "nightly-latest" ]]; then
+        if [[ ${{ inputs.version }} == "nightly-latest" ]]; then
           tag=`gh release list --repo dsp-testing/codeql-cli-nightlies -L 1 | cut -f 3`
           echo "tools-url=https://github.com/dsp-testing/codeql-cli-nightlies/releases/download/$tag/$artifact_name" >> $GITHUB_OUTPUT
-        elif [[ "$VERSION" == *"nightly"* ]]; then
+        elif [[ ${{ inputs.version }} == *"nightly"* ]]; then
-          version=`echo "$VERSION" | sed -e 's/^.*\-//'`
+          version=`echo ${{ inputs.version }} | sed -e 's/^.*\-//'`
-          echo "tools-url=https://github.com/dsp-testing/codeql-cli-nightlies/releases/download/codeql-bundle-$version/$artifact_name" >> $GITHUB_OUTPUT
+          echo "tools-url=https://github.com/dsp-testing/codeql-cli-nightlies/releases/download/codeql-bundle-$version-manual/$artifact_name" >> $GITHUB_OUTPUT
-        elif [[ "$VERSION" == *"stable"* ]]; then
+        elif [[ ${{ inputs.version }} == *"stable"* ]]; then
-          version=`echo "$VERSION" | sed -e 's/^.*\-//'`
+          version=`echo ${{ inputs.version }} | sed -e 's/^.*\-//'`
           echo "tools-url=https://github.com/github/codeql-action/releases/download/codeql-bundle-$version/$artifact_name" >> $GITHUB_OUTPUT
+        elif [[ ${{ inputs.version }} == "latest" ]]; then
+          echo "tools-url=latest" >> $GITHUB_OUTPUT
+        elif [[ ${{ inputs.version }} == "default" ]]; then
+          echo "tools-url=" >> $GITHUB_OUTPUT
         else
           echo "::error::Unrecognized version specified!"
           exit 1
         fi
-
-    - uses: fwilhe2/setup-kotlin@9c245a6425255f5e98ba1ce6c15d31fce7eca9da
-      if: ${{ inputs.setup-kotlin == 'true' }}
-      with:
-        version: 1.8.21

.github/actions/query-filter-test/action.yml

@@ -23,16 +23,7 @@ inputs:
   tools:
     required: true
     description: |
-      The version of CodeQL passed to the `tools` input of the init action.
+      The url of codeql to use.
-      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
@@ -48,6 +39,7 @@ runs:
     - uses: ./../action/analyze
       with:
         output: ${{ runner.temp }}/results
+        upload-database: false
         upload: never
       env:
         CODEQL_ACTION_TEST_MODE: "true"

.github/actions/release-branches/action.yml

@@ -1,28 +0,0 @@
-name: 'Release branches'
-description: 'Determine branches for release & backport'
-inputs:
-  major_version:
-    description: 'The version as extracted from the package.json file'
-    required: true
-  latest_tag:
-    description: 'The most recent tag published to the repository'
-    required: true
-outputs:
-  backport_source_branch:
-    description: "The release branch for the given tag"
-    value: ${{ steps.branches.outputs.backport_source_branch }}
-  backport_target_branches:
-    description: "JSON encoded list of branches to target with backports"
-    value: ${{ steps.branches.outputs.backport_target_branches }}
-runs:
-  using: "composite"
-  steps:
-    - id: branches
-      env:
-        MAJOR_VERSION: ${{ inputs.major_version }}
-        LATEST_TAG: ${{ inputs.latest_tag }}
-      run: |
-        python ${{ github.action_path }}/release-branches.py \
-            --major-version "$MAJOR_VERSION" \
-            --latest-tag "$LATEST_TAG"
-      shell: bash

.github/actions/release-branches/release-branches.py

@@ -1,55 +0,0 @@
-import argparse
-import json
-import os
-import configparser
-
-# Name of the remote
-ORIGIN = 'origin'
-
-script_dir = os.path.dirname(os.path.realpath(__file__))
-grandparent_dir = os.path.dirname(os.path.dirname(script_dir))
-
-config = configparser.ConfigParser()
-with open(os.path.join(grandparent_dir, 'releases.ini')) as stream:
-    config.read_string('[default]\n' + stream.read())
-
-OLDEST_SUPPORTED_MAJOR_VERSION = int(config['default']['OLDEST_SUPPORTED_MAJOR_VERSION'])
-
-def main():
-
-  parser = argparse.ArgumentParser()
-  parser.add_argument("--major-version", required=True, type=str, help="The major version of the release")
-  parser.add_argument("--latest-tag", required=True, type=str, help="The most recent tag published to the repository")
-  args = parser.parse_args()
-
-  major_version = args.major_version
-  latest_tag = args.latest_tag
-
-  print("major_version: " + major_version)
-  print("latest_tag: " + latest_tag)
-
-  # If this is a primary release, we backport to all supported branches,
-  # so we check whether the major_version taken from the package.json
-  # is greater than or equal to the latest tag pulled from the repo.
-  # For example...
-  #     'v1' >= 'v2' is False # we're operating from an older release branch and should not backport
-  #     'v2' >= 'v2' is True  # the normal case where we're updating the current version
-  #     'v3' >= 'v2' is True  # in this case we are making the first release of a new major version
-  consider_backports = ( major_version >= latest_tag.split(".")[0] )
-
-  with open(os.environ["GITHUB_OUTPUT"], "a") as f:
-
-    f.write(f"backport_source_branch=releases/{major_version}\n")
-
-    backport_target_branches = []
-
-    if consider_backports:
-      for i in range(int(major_version.strip("v"))-1, 0, -1):
-        branch_name = f"releases/v{i}"
-        if i >= OLDEST_SUPPORTED_MAJOR_VERSION:
-          backport_target_branches.append(branch_name)
-
-    f.write("backport_target_branches="+json.dumps(backport_target_branches)+"\n")
-
-if __name__ == "__main__":
-  main()

.github/actions/release-initialise/action.yml

@@ -1,33 +0,0 @@
-name: 'Prepare release job'
-description: 'Prepare for updating a release branch'
-
-runs:
-  using: "composite"
-  steps:
-
-    - name: Dump environment
-      run: env
-      shell: bash
-
-    - name: Dump GitHub context
-      env:
-        GITHUB_CONTEXT: '${{ toJson(github) }}'
-      run: echo "$GITHUB_CONTEXT"
-      shell: bash
-
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: 3.12
-
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install PyGithub==2.3.0 requests
-      shell: bash
-
-    - name: Update git config
-      run: |
-        git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
-        git config --global user.name "github-actions[bot]"
-      shell: bash

.github/actions/setup-swift/action.yml

@@ -11,7 +11,7 @@ runs:
       id: get_swift_version
       if: runner.os == 'Linux'
       shell: bash
-      env:
+      env: 
         CODEQL_PATH: ${{ inputs.codeql-path }}
       run: |
         SWIFT_EXTRACTOR_DIR="$("$CODEQL_PATH" resolve languages --format json | jq -r '.swift[0]')"
@@ -19,21 +19,19 @@ runs:
           VERSION="null"
         else
           VERSION="$("$SWIFT_EXTRACTOR_DIR/tools/linux64/extractor" --version | awk '/version/ { print $3 }')"
-          # Specify 5.x.0, otherwise setup Action will default to latest minor version.
+          # Specify 5.x.0, otherwise setup Action will default to latest minor version. 
           if [ $VERSION = "5.7" ]; then
             VERSION="5.7.0"
           elif [ $VERSION = "5.8" ]; then
             VERSION="5.8.0"
-          elif [ $VERSION = "5.9" ]; then
+          # setup-swift does not yet support v5.8.1 Remove this when it does.
-            VERSION="5.9.0"
+          elif [ $VERSION = "5.8.1" ]; then
-          # setup-swift does not yet support v5.9.1 Remove this when it does.
+            VERSION="5.8.0"
-          elif [ $VERSION = "5.9.1" ]; then
+          fi 
-            VERSION="5.9.0"
-          fi
         fi
         echo "version=$VERSION" | tee -a $GITHUB_OUTPUT
 
-    - uses: redsun82/setup-swift@362f49f31da2f5f4f851657046bdd1290d03edc8 # Please update the corresponding SHA in the CLI's CodeQL Action Integration Test.
+    - uses: swift-actions/setup-swift@f51889efb55dccf13be0ee727e3d6c89a096fb4c # Please update the corresponding SHA in the CLI's CodeQL Action Integration Test.
       if: runner.os == 'Linux' && steps.get_swift_version.outputs.version != 'null'
       with:
         swift-version: "${{ steps.get_swift_version.outputs.version }}"

.github/codeql/codeql-actions-config.yml

@@ -1,4 +0,0 @@
-# Configuration for the CodeQL Actions Queries
-name: "CodeQL Actions Queries config"
-queries:
-  - uses: security-and-quality

.github/dependabot.yml

@@ -2,8 +2,6 @@ version: 2
 updates:
   - package-ecosystem: npm
     directory: "/"
-    reviewers:
-      - "github/codeql-production-shield"
     schedule:
       interval: weekly
     labels:
@@ -16,18 +14,12 @@ updates:
       # v7 requires ESM
       - dependency-name: "del"
         versions: ["^7.0.0"]
-      # This is broken due to the way configuration files have changed. 
-      # This might be fixed when we move to eslint v9.
-      - dependency-name: "eslint-plugin-import"
-        versions: [">=2.30.0"]
     groups:
       npm:
         patterns:
           - "*"
   - package-ecosystem: github-actions
     directory: "/"
-    reviewers:
-      - "github/codeql-production-shield"
     schedule:
       interval: weekly
     groups:
@@ -36,8 +28,6 @@ updates:
           - "*"
   - package-ecosystem: github-actions
     directory: "/.github/actions/setup-swift/" # All subdirectories outside of "/.github/workflows" must be explicitly included.
-    reviewers:
-      - "github/codeql-production-shield"
     schedule:
       interval: weekly
     groups:

.github/releases.ini

@@ -1 +0,0 @@
-OLDEST_SUPPORTED_MAJOR_VERSION=3

.github/update-release-branch.py

@@ -1,7 +1,5 @@
 import argparse
 import datetime
-import fileinput
-import re
 from github import Github
 import json
 import os
@@ -15,9 +13,8 @@ No user facing changes.
 
 """
 
-# NB: This exact commit message is used to find commits for reverting during backports.
+SOURCE_BRANCH = 'main'
-# Changing it requires a transition period where both old and new versions are supported.
+TARGET_BRANCH = 'releases/v2'
-BACKPORT_COMMIT_MESSAGE = 'Update version and changelog for v'
 
 # Name of the remote
 ORIGIN = 'origin'
@@ -37,9 +34,7 @@ def branch_exists_on_remote(branch_name):
   return run_git('ls-remote', '--heads', ORIGIN, branch_name).strip() != ''
 
 # Opens a PR from the given branch to the target branch
-def open_pr(
+def open_pr(repo, all_commits, source_branch_short_sha, new_branch_name, conductor):
-  repo, all_commits, source_branch_short_sha, new_branch_name, source_branch, target_branch,
-  conductor, is_primary_release, conflicted_files):
   # Sort the commits into the pull requests that introduced them,
   # and any commits that don't have a pull request
   pull_requests = []
@@ -61,7 +56,7 @@ def open_pr(
 
   # Start constructing the body text
   body = []
-  body.append(f'Merging {source_branch_short_sha} into `{target_branch}`.')
+  body.append(f'Merging {source_branch_short_sha} into {TARGET_BRANCH}.')
 
   body.append('')
   body.append(f'Conductor for this PR is @{conductor}.')
@@ -84,38 +79,20 @@ def open_pr(
 
   body.append('')
   body.append('Please do the following:')
-  if len(conflicted_files) > 0:
-    body.append(' - [ ] Ensure `package.json` file contains the correct version.')
-    body.append(' - [ ] Add commits to this branch to resolve the merge conflicts ' +
-      'in the following files:')
-    body.extend([f'    - [ ] `{file}`' for file in conflicted_files])
-    body.append(' - [ ] Ensure another maintainer has reviewed the additional commits you added to this ' +
-      'branch to resolve the merge conflicts.')
   body.append(' - [ ] Ensure the CHANGELOG displays the correct version and date.')
   body.append(' - [ ] Ensure the CHANGELOG includes all relevant, user-facing changes since the last release.')
-  body.append(f' - [ ] Check that there are not any unexpected commits being merged into the `{target_branch}` branch.')
+  body.append(f' - [ ] Check that there are not any unexpected commits being merged into the {TARGET_BRANCH} branch.')
   body.append(' - [ ] Ensure the docs team is aware of any documentation changes that need to be released.')
-
-  if not is_primary_release:
-    body.append(' - [ ] Remove and re-add the "Update dependencies" label to the PR to trigger just this workflow.')
-    body.append(' - [ ] Wait for the "Update dependencies" workflow to push a commit updating the dependencies.')
-
-  body.append(' - [ ] Mark the PR as ready for review to trigger the full set of PR checks.')
   body.append(' - [ ] Approve and merge this PR. Make sure `Create a merge commit` is selected rather than `Squash and merge` or `Rebase and merge`.')
+  body.append(' - [ ] Merge the mergeback PR that will automatically be created once this PR is merged.')
 
-  if is_primary_release:
+  title = f'Merge {SOURCE_BRANCH} into {TARGET_BRANCH}'
-    body.append(' - [ ] Merge the mergeback PR that will automatically be created once this PR is merged.')
-    body.append(' - [ ] Merge all backport PRs to older release branches, that will automatically be created once this PR is merged.')
-
-  title = f'Merge {source_branch} into {target_branch}'
-  labels = ['Update dependencies'] if not is_primary_release else []
 
   # Create the pull request
   # PR checks won't be triggered on PRs created by Actions. Therefore mark the PR as draft so that
   # a maintainer can take the PR out of draft, thereby triggering the PR checks.
-  pr = repo.create_pull(title=title, body='\n'.join(body), head=new_branch_name, base=target_branch, draft=True)
+  pr = repo.create_pull(title=title, body='\n'.join(body), head=new_branch_name, base=TARGET_BRANCH, draft=True)
-  pr.add_to_labels(*labels)
+  print(f'Created PR #{pr.number}')
-  print(f'Created PR #{str(pr.number)}')
 
   # Assign the conductor
   pr.add_to_assignees(conductor)
@@ -125,10 +102,10 @@ def open_pr(
 # since the last release to the target branch.
 # This will not include any commits that exist on the target branch
 # that aren't on the source branch.
-def get_commit_difference(repo, source_branch, target_branch):
+def get_commit_difference(repo):
   # Passing split nothing means that the empty string splits to nothing: compare `''.split() == []`
   # to `''.split('\n') == ['']`.
-  commits = run_git('log', '--pretty=format:%H', f'{ORIGIN}/{target_branch}..{ORIGIN}/{source_branch}').strip().split()
+  commits = run_git('log', '--pretty=format:%H', f'{ORIGIN}/{TARGET_BRANCH}..{ORIGIN}/{SOURCE_BRANCH}').strip().split()
 
   # Convert to full-fledged commit objects
   commits = [repo.get_commit(c) for c in commits]
@@ -172,78 +149,10 @@ 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)
 
-def process_changelog_for_backports(source_branch_major_version, target_branch_major_version):
-
-  # changelog entries can use the following format to indicate
-  # that they only apply to newer versions
-  some_versions_only_regex = re.compile(r'\[v(\d+)\+ only\]')
-
-  output = ''
-
-  with open('CHANGELOG.md', 'r') as f:
-
-    # until we find the first section, just duplicate all lines
-    found_first_section = False
-    while not found_first_section:
-      line = f.readline()
-      if not line:
-        raise Exception('Could not find any change sections in CHANGELOG.md') # EOF
-
-      if line.startswith('## '):
-        line = line.replace(f'## {source_branch_major_version}', f'## {target_branch_major_version}')
-        found_first_section = True
-
-      output += line
-
-    # found_content tracks whether we hit two headings in a row
-    found_content = False
-    output += '\n'
-    while True:
-      line = f.readline()
-      if not line:
-        break # EOF
-      line = line.rstrip('\n')
-
-      # filter out changenote entries that apply only to newer versions
-      match = some_versions_only_regex.search(line)
-      if match:
-        if int(target_branch_major_version) < int(match.group(1)):
-          continue
-
-      if line.startswith('## '):
-        line = line.replace(f'## {source_branch_major_version}', f'## {target_branch_major_version}')
-        if found_content == False:
-          # we have found two headings in a row, so we need to add the placeholder message.
-          output += 'No user facing changes.\n'
-        found_content = False
-        output += f'\n{line}\n\n'
-      else:
-        if line.strip() != '':
-          found_content = True
-          # we use the original line here, rather than the stripped version
-          # so that we preserve indentation
-          output += line + '\n'
-
-    with open('CHANGELOG.md', 'w') as f:
-      f.write(output)
-
 def update_changelog(version):
   if (os.path.exists('CHANGELOG.md')):
     content = ''
@@ -273,24 +182,6 @@ def main():
     required=True,
     help='The nwo of the repository, for example github/codeql-action.'
   )
-  parser.add_argument(
-    '--source-branch',
-    type=str,
-    required=True,
-    help='Source branch for release branch update.'
-  )
-  parser.add_argument(
-    '--target-branch',
-    type=str,
-    required=True,
-    help='Target branch for release branch update.'
-  )
-  parser.add_argument(
-    '--is-primary-release',
-    action='store_true',
-    default=False,
-    help='Whether this update is the primary release for the current major version.'
-  )
   parser.add_argument(
     '--conductor',
     type=str,
@@ -300,38 +191,24 @@ def main():
 
   args = parser.parse_args()
 
-  source_branch = args.source_branch
-  target_branch = args.target_branch
-  is_primary_release = args.is_primary_release
-
   repo = Github(args.github_token).get_repo(args.repository_nwo)
-
+  version = get_current_version()
-  # the target branch will be of the form releases/vN, where N is the major version number
-  target_branch_major_version = target_branch.strip('releases/v')
-
-  # split version into major, minor, patch
-  _, v_minor, v_patch = get_current_version().split('.')
-
-  version = f"{target_branch_major_version}.{v_minor}.{v_patch}"
 
   # Print what we intend to go
-  print(f'Considering difference between {source_branch} and {target_branch}...')
+  print(f'Considering difference between {SOURCE_BRANCH} and {TARGET_BRANCH}...')
-  source_branch_short_sha = run_git('rev-parse', '--short', f'{ORIGIN}/{source_branch}').strip()
+  source_branch_short_sha = run_git('rev-parse', '--short', f'{ORIGIN}/{SOURCE_BRANCH}').strip()
-  print(f'Current head of {source_branch} is {source_branch_short_sha}.')
+  print(f'Current head of {SOURCE_BRANCH} is {source_branch_short_sha}.')
 
   # See if there are any commits to merge in
-  commits = get_commit_difference(repo=repo, source_branch=source_branch, target_branch=target_branch)
+  commits = get_commit_difference(repo=repo)
   if len(commits) == 0:
-    print(f'No commits to merge from {source_branch} to {target_branch}.')
+    print(f'No commits to merge from {SOURCE_BRANCH} to {TARGET_BRANCH}.')
     return
 
-  # define distinct prefix in order to support specific pr checks on backports
-  branch_prefix = 'update' if is_primary_release else 'backport'
-
   # The branch name is based off of the name of branch being merged into
   # and the SHA of the branch being merged from. Thus if the branch already
   # exists we can assume we don't need to recreate it.
-  new_branch_name = f'{branch_prefix}-v{version}-{source_branch_short_sha}'
+  new_branch_name = f'update-v{version}-{source_branch_short_sha}'
   print(f'Branch name is {new_branch_name}.')
 
   # Check if the branch already exists. If so we can abort as this script
@@ -343,74 +220,17 @@ def main():
   # Create the new branch and push it to the remote
   print(f'Creating branch {new_branch_name}.')
 
-  # The process of creating the v{Older} release can run into merge conflicts. We commit the unresolved
+  # If we're performing a standard release, there won't be any new commits on the target branch,
-  # conflicts so a maintainer can easily resolve them (vs erroring and requiring maintainers to
+  # as these will have already been merged back into the source branch. Therefore we can just
-  # reconstruct the release manually)
+  # start from the source branch.
-  conflicted_files = []
+  run_git('checkout', '-b', new_branch_name, f'{ORIGIN}/{SOURCE_BRANCH}')
 
-  if not is_primary_release:
+  print('Updating changelog')
+  update_changelog(version)
 
-    # the source branch will be of the form releases/vN, where N is the major version number
+  # Create a commit that updates the CHANGELOG
-    source_branch_major_version = source_branch.strip('releases/v')
+  run_git('add', 'CHANGELOG.md')
-
+  run_git('commit', '-m', f'Update changelog for v{version}')
-    # If we're performing a backport, start from the target branch
-    print(f'Creating {new_branch_name} from the {ORIGIN}/{target_branch} branch')
-    run_git('checkout', '-b', new_branch_name, f'{ORIGIN}/{target_branch}')
-
-    # Revert the commit that we made as part of the last release that updated the version number and
-    # changelog to refer to {older}.x.x variants. This avoids merge conflicts in the changelog and
-    # package.json files when we merge in the v{latest} branch.
-    # This commit will not exist the first time we release the v{N-1} branch from the v{N} branch, so we
-    # use `git log --grep` to conditionally revert the commit.
-    print('Reverting the version number and changelog updates from the last release to avoid conflicts')
-    vOlder_update_commits = run_git('log', '--grep', f'^{BACKPORT_COMMIT_MESSAGE}', '--format=%H').split()
-
-    if len(vOlder_update_commits) > 0:
-      print(f'  Reverting {vOlder_update_commits[0]}')
-      # Only revert the newest commit as older ones will already have been reverted in previous
-      # releases.
-      run_git('revert', vOlder_update_commits[0], '--no-edit')
-
-      # Also revert the "Update checked-in dependencies" commit created by Actions.
-      update_dependencies_commit = run_git('log', '--grep', '^Update checked-in dependencies', '--format=%H').split()[0]
-      print(f'  Reverting {update_dependencies_commit}')
-      run_git('revert', update_dependencies_commit, '--no-edit')
-
-    else:
-      print('  Nothing to revert.')
-
-    print(f'Merging {ORIGIN}/{source_branch} into the release prep branch')
-    # Commit any conflicts (see the comment for `conflicted_files`)
-    run_git('merge', f'{ORIGIN}/{source_branch}', allow_non_zero_exit_code=True)
-    conflicted_files = run_git('diff', '--name-only', '--diff-filter', 'U').splitlines()
-    if len(conflicted_files) > 0:
-      run_git('add', '.')
-      run_git('commit', '--no-edit')
-
-    # Migrate the package version number from a vLatest version number to a vOlder version number
-    print(f'Setting version number to {version} in package.json')
-    replace_version_package_json(get_current_version(), version) # We rely on the `Update dependencies` workflow to update package-lock.json
-    run_git('add', 'package.json')
-
-    # 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}')
-    process_changelog_for_backports(source_branch_major_version, target_branch_major_version)
-
-    # Amend the commit generated by `npm version` to update the CHANGELOG
-    run_git('add', 'CHANGELOG.md')
-    run_git('commit', '-m', f'{BACKPORT_COMMIT_MESSAGE}{version}')
-  else:
-    # If we're performing a standard release, there won't be any new commits on the target branch,
-    # as these will have already been merged back into the source branch. Therefore we can just
-    # start from the source branch.
-    run_git('checkout', '-b', new_branch_name, f'{ORIGIN}/{source_branch}')
-
-    print('Updating changelog')
-    update_changelog(version)
-
-    # Create a commit that updates the CHANGELOG
-    run_git('add', 'CHANGELOG.md')
-    run_git('commit', '-m', f'Update changelog for v{version}')
 
   run_git('push', ORIGIN, new_branch_name)
 
@@ -420,11 +240,7 @@ def main():
     commits,
     source_branch_short_sha,
     new_branch_name,
-    source_branch=source_branch,
-    target_branch=target_branch,
     conductor=args.conductor,
-    is_primary_release=is_primary_release,
-    conflicted_files=conflicted_files
   )
 
 if __name__ == '__main__':

.github/workflows/__all-platform-bundle.yml

@@ -7,53 +7,61 @@ name: PR Check - All-platform bundle
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GO111MODULE: auto
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v2
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   all-platform-bundle:
     strategy:
-      fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: nightly-latest
+          version: nightly-latest
     name: All-platform bundle
     permissions:
       contents: read
-      security-events: read
+      security-events: write
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Check out repository
+    - name: Check out repository
-        uses: actions/checkout@v4
+      uses: actions/checkout@v4
-      - name: Prepare test
+    - name: Prepare test
-        id: prepare-test
+      id: prepare-test
-        uses: ./.github/actions/prepare-test
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          version: ${{ matrix.version }}
+        version: ${{ matrix.version }}
-          use-all-platform-bundle: 'true'
+        use-all-platform-bundle: 'true'
-          setup-kotlin: 'true'
+    - name: Set environment variable for Swift enablement
-      - id: init
+      if: >-
-        uses: ./../action/init
+        runner.os != 'Windows' && (
-        with:
+            matrix.version == '20220908' ||
-      # Swift is not supported on Ubuntu so we manually exclude it from the list here
+            matrix.version == '20221211'
-          languages: cpp,csharp,go,java,javascript,python,ruby
+        )
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+      shell: bash
-      - name: Build code
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-        shell: bash
+    - id: init
-        run: ./build.sh
+      uses: ./../action/init
-      - uses: ./../action/analyze
+      with:
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
+    - uses: ./../action/.github/actions/setup-swift
+      with:
+        codeql-path: ${{ steps.init.outputs.codeql-path }}
+    - name: Build code
+      shell: bash
+      run: ./build.sh
+    - uses: ./../action/analyze
+      with:
+        upload-database: false
     env:
       CODEQL_ACTION_TEST_MODE: true

.github/workflows/__analyze-ref-input.yml

@@ -7,60 +7,108 @@ name: "PR Check - Analyze: 'ref' and 'sha' from inputs"
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GO111MODULE: auto
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v2
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   analyze-ref-input:
     strategy:
-      fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: default
+          version: stable-20220908
-          - os: macos-latest
+        - os: macos-latest
-            version: default
+          version: stable-20220908
-          - os: windows-latest
+        - os: windows-latest
-            version: default
+          version: stable-20220908
+        - os: ubuntu-latest
+          version: stable-20221211
+        - os: macos-latest
+          version: stable-20221211
+        - os: windows-latest
+          version: stable-20221211
+        - os: ubuntu-latest
+          version: stable-20230418
+        - os: macos-latest
+          version: stable-20230418
+        - os: windows-latest
+          version: stable-20230418
+        - os: ubuntu-latest
+          version: stable-v2.13.5
+        - os: macos-latest
+          version: stable-v2.13.5
+        - os: windows-latest
+          version: stable-v2.13.5
+        - os: ubuntu-latest
+          version: stable-v2.14.6
+        - os: macos-latest
+          version: stable-v2.14.6
+        - os: windows-latest
+          version: stable-v2.14.6
+        - os: ubuntu-latest
+          version: default
+        - os: macos-latest
+          version: default
+        - os: windows-latest
+          version: default
+        - os: ubuntu-latest
+          version: latest
+        - os: macos-latest
+          version: latest
+        - os: windows-latest
+          version: latest
+        - os: ubuntu-latest
+          version: nightly-latest
+        - os: macos-latest
+          version: nightly-latest
+        - os: windows-latest
+          version: nightly-latest
     name: "Analyze: 'ref' and 'sha' from inputs"
     permissions:
       contents: read
-      security-events: read
+      security-events: write
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Check out repository
+    - name: Check out repository
-        uses: actions/checkout@v4
+      uses: actions/checkout@v4
-      - name: Prepare test
+    - name: Prepare test
-        id: prepare-test
+      id: prepare-test
-        uses: ./.github/actions/prepare-test
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          version: ${{ matrix.version }}
+        version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
+        use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
+    - name: Set environment variable for Swift enablement
-      - uses: ./../action/init
+      if: >-
-        with:
+        runner.os != 'Windows' && (
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+            matrix.version == '20220908' ||
-          languages: cpp,csharp,java,javascript,python
+            matrix.version == '20221211'
-          config-file: ${{ github.repository }}/tests/multi-language-repo/.github/codeql/custom-queries.yml@${{
+        )
-            github.sha }}
+      shell: bash
-      - name: Build code
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-        shell: bash
+    - uses: ./../action/init
-        run: ./build.sh
+      with:
-      - uses: ./../action/analyze
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
-        with:
+        languages: cpp,csharp,java,javascript,python
-          ref: refs/heads/main
+        config-file: ${{ github.repository }}/tests/multi-language-repo/.github/codeql/custom-queries.yml@${{
-          sha: 5e235361806c361d4d3f8859e3c897658025a9a2
+          github.sha }}
+    - name: Build code
+      shell: bash
+      run: ./build.sh
+    - uses: ./../action/analyze
+      with:
+        upload-database: false
+        ref: refs/heads/main
+        sha: 5e235361806c361d4d3f8859e3c897658025a9a2
     env:
       CODEQL_ACTION_TEST_MODE: true

.github/workflows/__autobuild-action.yml

@@ -7,69 +7,76 @@ name: PR Check - autobuild-action
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GO111MODULE: auto
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v2
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   autobuild-action:
     strategy:
-      fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: linked
+          version: latest
-          - os: macos-latest
+        - os: macos-latest
-            version: linked
+          version: latest
-          - os: windows-latest
+        - os: windows-latest
-            version: linked
+          version: latest
     name: autobuild-action
     permissions:
       contents: read
-      security-events: read
+      security-events: write
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Check out repository
+    - name: Check out repository
-        uses: actions/checkout@v4
+      uses: actions/checkout@v4
-      - name: Prepare test
+    - name: Prepare test
-        id: prepare-test
+      id: prepare-test
-        uses: ./.github/actions/prepare-test
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          version: ${{ matrix.version }}
+        version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
+        use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
+    - name: Set environment variable for Swift enablement
-      - uses: ./../action/init
+      if: >-
-        with:
+        runner.os != 'Windows' && (
-          languages: csharp
+            matrix.version == '20220908' ||
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+            matrix.version == '20221211'
-      - uses: ./../action/autobuild
+        )
-        env:
+      shell: bash
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
+    - uses: ./../action/init
+      with:
+        languages: csharp
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
+    - uses: ./../action/autobuild
+      env:
       # Explicitly disable the CLR tracer.
-          COR_ENABLE_PROFILING: ''
+        COR_ENABLE_PROFILING: ''
-          COR_PROFILER: ''
+        COR_PROFILER: ''
-          COR_PROFILER_PATH_64: ''
+        COR_PROFILER_PATH_64: ''
-          CORECLR_ENABLE_PROFILING: ''
+        CORECLR_ENABLE_PROFILING: ''
-          CORECLR_PROFILER: ''
+        CORECLR_PROFILER: ''
-          CORECLR_PROFILER_PATH_64: ''
+        CORECLR_PROFILER_PATH_64: ''
-      - uses: ./../action/analyze
+    - uses: ./../action/analyze
-      - name: Check database
+      with:
-        shell: bash
+        upload-database: false
-        run: |
+    - name: Check database
-          cd "$RUNNER_TEMP/codeql_databases"
+      shell: bash
-          if [[ ! -d csharp ]]; then
+      run: |
-            echo "Did not find a C# database"
+        cd "$RUNNER_TEMP/codeql_databases"
-            exit 1
+        if [[ ! -d csharp ]]; then
-          fi
+          echo "Did not find a C# database"
+          exit 1
+        fi
     env:
       CODEQL_ACTION_TEST_MODE: true

.github/workflows/__autobuild-direct-tracing-with-working-dir.yml

@@ -1,80 +0,0 @@
-# Warning: This file is generated automatically, and should not be modified.
-# Instead, please modify the template in the pr-checks directory and run:
-#     (cd pr-checks; pip install ruamel.yaml@0.17.31 && python3 sync.py)
-# to regenerate this file.
-
-name: PR Check - Autobuild direct tracing (custom working directory)
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  GO111MODULE: auto
-on:
-  push:
-    branches:
-      - main
-      - releases/v*
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
-  workflow_dispatch: {}
-jobs:
-  autobuild-direct-tracing-with-working-dir:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-latest
-            version: linked
-          - os: windows-latest
-            version: linked
-          - os: ubuntu-latest
-            version: nightly-latest
-          - os: windows-latest
-            version: nightly-latest
-    name: Autobuild direct tracing (custom working directory)
-    permissions:
-      contents: read
-      security-events: read
-    timeout-minutes: 45
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
-      - name: Test setup
-        shell: bash
-        run: |
-          # Make sure that Gradle build succeeds in autobuild-dir ...
-          cp -a ../action/tests/java-repo autobuild-dir
-          # ... and fails if attempted in the current directory
-          echo > build.gradle
-      - uses: ./../action/init
-        with:
-          build-mode: autobuild
-          languages: java
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
-      - name: Check that indirect tracing is disabled
-        shell: bash
-        run: |
-          if [[ ! -z "${CODEQL_RUNNER}" ]]; then
-            echo "Expected indirect tracing to be disabled, but the" \
-              "CODEQL_RUNNER environment variable is set."
-            exit 1
-          fi
-      - uses: ./../action/autobuild
-        with:
-          working-directory: autobuild-dir
-      - uses: ./../action/analyze
-    env:
-      CODEQL_ACTION_AUTOBUILD_BUILD_MODE_DIRECT_TRACING: true
-      CODEQL_ACTION_TEST_MODE: true

.github/workflows/__autobuild-direct-tracing.yml

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

.github/workflows/__build-mode-autobuild.yml

@@ -1,73 +0,0 @@
-# Warning: This file is generated automatically, and should not be modified.
-# Instead, please modify the template in the pr-checks directory and run:
-#     (cd pr-checks; pip install ruamel.yaml@0.17.31 && python3 sync.py)
-# to regenerate this file.
-
-name: PR Check - Build mode autobuild
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  GO111MODULE: auto
-on:
-  push:
-    branches:
-      - main
-      - releases/v*
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
-  workflow_dispatch: {}
-jobs:
-  build-mode-autobuild:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-latest
-            version: nightly-latest
-    name: Build mode autobuild
-    permissions:
-      contents: read
-      security-events: read
-    timeout-minutes: 45
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
-      - name: Set up Java test repo configuration
-        run: |
-          mv * .github ../action/tests/multi-language-repo/
-          mv ../action/tests/multi-language-repo/.github/workflows .github
-          mv ../action/tests/java-repo/* .
-
-      - uses: ./../action/init
-        id: init
-        with:
-          build-mode: autobuild
-          db-location: ${{ runner.temp }}/customDbLocation
-          languages: java
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
-
-      - name: Validate database build mode
-        run: |
-          metadata_path="$RUNNER_TEMP/customDbLocation/java/codeql-database.yml"
-          build_mode=$(yq eval '.buildMode' "$metadata_path")
-          if [[ "$build_mode" != "autobuild" ]]; then
-            echo "Expected build mode to be 'autobuild' but was $build_mode"
-            exit 1
-          fi
-
-      - uses: ./../action/analyze
-    env:
-      CODEQL_ACTION_TEST_MODE: true

.github/workflows/__build-mode-manual.yml

@@ -1,71 +0,0 @@
-# Warning: This file is generated automatically, and should not be modified.
-# Instead, please modify the template in the pr-checks directory and run:
-#     (cd pr-checks; pip install ruamel.yaml@0.17.31 && python3 sync.py)
-# to regenerate this file.
-
-name: PR Check - Build mode manual
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  GO111MODULE: auto
-on:
-  push:
-    branches:
-      - main
-      - releases/v*
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
-  workflow_dispatch: {}
-jobs:
-  build-mode-manual:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-latest
-            version: nightly-latest
-    name: Build mode manual
-    permissions:
-      contents: read
-      security-events: read
-    timeout-minutes: 45
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
-      - uses: ./../action/init
-        id: init
-        with:
-          build-mode: manual
-          db-location: ${{ runner.temp }}/customDbLocation
-          languages: java
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
-
-      - name: Validate database build mode
-        run: |
-          metadata_path="$RUNNER_TEMP/customDbLocation/java/codeql-database.yml"
-          build_mode=$(yq eval '.buildMode' "$metadata_path")
-          if [[ "$build_mode" != "manual" ]]; then
-            echo "Expected build mode to be 'manual' but was $build_mode"
-            exit 1
-          fi
-
-      - name: Build code
-        shell: bash
-        run: ./build.sh
-
-      - uses: ./../action/analyze
-    env:
-      CODEQL_ACTION_TEST_MODE: true

.github/workflows/__build-mode-none.yml

@@ -1,73 +0,0 @@
-# Warning: This file is generated automatically, and should not be modified.
-# Instead, please modify the template in the pr-checks directory and run:
-#     (cd pr-checks; pip install ruamel.yaml@0.17.31 && python3 sync.py)
-# to regenerate this file.
-
-name: PR Check - Build mode none
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  GO111MODULE: auto
-on:
-  push:
-    branches:
-      - main
-      - releases/v*
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
-  workflow_dispatch: {}
-jobs:
-  build-mode-none:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-latest
-            version: linked
-          - os: ubuntu-latest
-            version: nightly-latest
-    name: Build mode none
-    permissions:
-      contents: read
-      security-events: read
-    timeout-minutes: 45
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
-      - uses: ./../action/init
-        id: init
-        with:
-          build-mode: none
-          db-location: ${{ runner.temp }}/customDbLocation
-          languages: java
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
-
-      - name: Validate database build mode
-        run: |
-          metadata_path="$RUNNER_TEMP/customDbLocation/java/codeql-database.yml"
-          build_mode=$(yq eval '.buildMode' "$metadata_path")
-          if [[ "$build_mode" != "none" ]]; then
-            echo "Expected build mode to be 'none' but was $build_mode"
-            exit 1
-          fi
-
-  # The latest nightly supports omitting the autobuild Action when the build mode is specified.
-      - uses: ./../action/autobuild
-        if: matrix.version != 'nightly-latest'
-
-      - uses: ./../action/analyze
-    env:
-      CODEQL_ACTION_TEST_MODE: true

.github/workflows/__build-mode-rollback.yml

@@ -1,74 +0,0 @@
-# Warning: This file is generated automatically, and should not be modified.
-# Instead, please modify the template in the pr-checks directory and run:
-#     (cd pr-checks; pip install ruamel.yaml@0.17.31 && python3 sync.py)
-# to regenerate this file.
-
-name: PR Check - Build mode rollback
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  GO111MODULE: auto
-on:
-  push:
-    branches:
-      - main
-      - releases/v*
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
-  workflow_dispatch: {}
-jobs:
-  build-mode-rollback:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-latest
-            version: nightly-latest
-    name: Build mode rollback
-    permissions:
-      contents: read
-      security-events: read
-    timeout-minutes: 45
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
-      - name: Set up Java test repo configuration
-        run: |
-          mv * .github ../action/tests/multi-language-repo/
-          mv ../action/tests/multi-language-repo/.github/workflows .github
-          mv ../action/tests/java-repo/* .
-
-      - uses: ./../action/init
-        id: init
-        with:
-          build-mode: none
-          db-location: ${{ runner.temp }}/customDbLocation
-          languages: java
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
-
-      - name: Validate database build mode
-        run: |
-          metadata_path="$RUNNER_TEMP/customDbLocation/java/codeql-database.yml"
-          build_mode=$(yq eval '.buildMode' "$metadata_path")
-          if [[ "$build_mode" != "autobuild" ]]; then
-            echo "Expected build mode to be 'autobuild' but was $build_mode"
-            exit 1
-          fi
-
-      - uses: ./../action/analyze
-    env:
-      CODEQL_ACTION_DISABLE_JAVA_BUILDLESS: true
-      CODEQL_ACTION_TEST_MODE: true

.github/workflows/__cleanup-db-cluster-dir.yml

@@ -1,69 +0,0 @@
-# Warning: This file is generated automatically, and should not be modified.
-# Instead, please modify the template in the pr-checks directory and run:
-#     (cd pr-checks; pip install ruamel.yaml@0.17.31 && python3 sync.py)
-# to regenerate this file.
-
-name: PR Check - Clean up database cluster directory
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  GO111MODULE: auto
-on:
-  push:
-    branches:
-      - main
-      - releases/v*
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
-  workflow_dispatch: {}
-jobs:
-  cleanup-db-cluster-dir:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-latest
-            version: linked
-    name: Clean up database cluster directory
-    permissions:
-      contents: read
-      security-events: read
-    timeout-minutes: 45
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
-      - name: Add a file to the database cluster directory
-        run: |
-          mkdir -p "${{ runner.temp }}/customDbLocation/javascript"
-          touch "${{ runner.temp }}/customDbLocation/javascript/a-file-to-clean-up.txt"
-
-      - uses: ./../action/init
-        id: init
-        with:
-          build-mode: none
-          db-location: ${{ runner.temp }}/customDbLocation
-          languages: javascript
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
-
-      - name: Validate file cleaned up
-        run: |
-          if [[ -f "${{ runner.temp }}/customDbLocation/javascript/a-file-to-clean-up.txt" ]]; then
-            echo "File was not cleaned up"
-            exit 1
-          fi
-          echo "File was cleaned up"
-    env:
-      CODEQL_ACTION_TEST_MODE: true

.github/workflows/__config-export.yml

@@ -7,94 +7,100 @@ name: PR Check - Config export
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GO111MODULE: auto
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v2
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   config-export:
     strategy:
-      fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: linked
+          version: latest
-          - os: macos-latest
+        - os: macos-latest
-            version: linked
+          version: latest
-          - os: windows-latest
+        - os: windows-latest
-            version: linked
+          version: latest
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: nightly-latest
+          version: nightly-latest
-          - os: macos-latest
+        - os: macos-latest
-            version: nightly-latest
+          version: nightly-latest
-          - os: windows-latest
+        - os: windows-latest
-            version: nightly-latest
+          version: nightly-latest
     name: Config export
     permissions:
       contents: read
-      security-events: read
+      security-events: write
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Check out repository
+    - name: Check out repository
-        uses: actions/checkout@v4
+      uses: actions/checkout@v4
-      - name: Prepare test
+    - name: Prepare test
-        id: prepare-test
+      id: prepare-test
-        uses: ./.github/actions/prepare-test
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          version: ${{ matrix.version }}
+        version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
+        use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
+    - name: Set environment variable for Swift enablement
-      - uses: ./../action/init
+      if: >-
-        with:
+        runner.os != 'Windows' && (
-          languages: javascript
+            matrix.version == '20220908' ||
-          queries: security-extended
+            matrix.version == '20221211'
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+        )
-      - uses: ./../action/analyze
+      shell: bash
-        with:
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-          output: ${{ runner.temp }}/results
+    - uses: ./../action/init
-          upload-database: false
+      with:
-      - name: Upload SARIF
+        languages: javascript
-        uses: actions/upload-artifact@v4
+        queries: security-extended
-        with:
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
-          name: config-export-${{ matrix.os }}-${{ matrix.version }}.sarif.json
+    - uses: ./../action/analyze
-          path: ${{ runner.temp }}/results/javascript.sarif
+      with:
-          retention-days: 7
+        output: ${{ runner.temp }}/results
-      - name: Check config properties appear in SARIF
+        upload-database: false
-        uses: actions/github-script@v7
+    - name: Upload SARIF
-        env:
+      uses: actions/upload-artifact@v3
-          SARIF_PATH: ${{ runner.temp }}/results/javascript.sarif
+      with:
-        with:
+        name: config-export-${{ matrix.os }}-${{ matrix.version }}.sarif.json
-          script: |
+        path: ${{ runner.temp }}/results/javascript.sarif
-            const fs = require('fs');
+        retention-days: 7
+    - name: Check config properties appear in SARIF
+      uses: actions/github-script@v6
+      env:
+        SARIF_PATH: ${{ runner.temp }}/results/javascript.sarif
+      with:
+        script: |
+          const fs = require('fs');
 
-            const sarif = JSON.parse(fs.readFileSync(process.env['SARIF_PATH'], 'utf8'));
+          const sarif = JSON.parse(fs.readFileSync(process.env['SARIF_PATH'], 'utf8'));
-            const run = sarif.runs[0];
+          const run = sarif.runs[0];
-            const configSummary = run.properties.codeqlConfigSummary;
+          const configSummary = run.properties.codeqlConfigSummary;
 
-            if (configSummary === undefined) {
+          if (configSummary === undefined) {
-              core.setFailed('`codeqlConfigSummary` property not found in the SARIF run property bag.');
+            core.setFailed('`codeqlConfigSummary` property not found in the SARIF run property bag.');
-            }
+          }
-            if (configSummary.disableDefaultQueries !== false) {
+          if (configSummary.disableDefaultQueries !== false) {
-              core.setFailed('`disableDefaultQueries` property incorrect: expected false, got ' +
+            core.setFailed('`disableDefaultQueries` property incorrect: expected false, got ' + 
-                `${JSON.stringify(configSummary.disableDefaultQueries)}.`);
+              `${JSON.stringify(configSummary.disableDefaultQueries)}.`);
-            }
+          }
-            const expectedQueries = [{ type: 'builtinSuite', uses: 'security-extended' }];
+          const expectedQueries = [{ type: 'builtinSuite', uses: 'security-extended' }];
-            // Use JSON.stringify to deep-equal the arrays.
+          // Use JSON.stringify to deep-equal the arrays.
-            if (JSON.stringify(configSummary.queries) !== JSON.stringify(expectedQueries)) {
+          if (JSON.stringify(configSummary.queries) !== JSON.stringify(expectedQueries)) {
-              core.setFailed(`\`queries\` property incorrect: expected ${JSON.stringify(expectedQueries)}, got ` +
+            core.setFailed(`\`queries\` property incorrect: expected ${JSON.stringify(expectedQueries)}, got ` + 
-                `${JSON.stringify(configSummary.queries)}.`);
+              `${JSON.stringify(configSummary.queries)}.`);
-            }
+          }
-            core.info('Finished config export tests.');
+          core.info('Finished config export tests.');
     env:
+      CODEQL_PASS_CONFIG_TO_CLI: true
       CODEQL_ACTION_TEST_MODE: true

.github/workflows/__config-input.yml

@@ -1,77 +0,0 @@
-# Warning: This file is generated automatically, and should not be modified.
-# Instead, please modify the template in the pr-checks directory and run:
-#     (cd pr-checks; pip install ruamel.yaml@0.17.31 && python3 sync.py)
-# to regenerate this file.
-
-name: PR Check - Config input
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  GO111MODULE: auto
-on:
-  push:
-    branches:
-      - main
-      - releases/v*
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
-  workflow_dispatch: {}
-jobs:
-  config-input:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-latest
-            version: linked
-    name: Config input
-    permissions:
-      contents: read
-      security-events: read
-    timeout-minutes: 45
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
-      - name: Copy queries into workspace
-        run: |
-          cp -a ../action/queries .
-
-      - uses: ./../action/init
-        with:
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
-          languages: javascript
-          build-mode: none
-          config: |
-            disable-default-queries: true
-            queries:
-              - name: Run custom query
-                uses: ./queries/default-setup-environment-variables.ql
-            paths-ignore:
-              - tests
-              - lib
-
-      - uses: ./../action/analyze
-        with:
-          output: ${{ runner.temp }}/results
-
-      - name: Check SARIF
-        uses: ./../action/.github/actions/check-sarif
-        with:
-          sarif-file: ${{ runner.temp }}/results/javascript.sarif
-          queries-run: javascript/codeql-action/default-setup-env-vars
-          queries-not-run: javascript/codeql-action/default-setup-context-properties
-    env:
-      CODEQL_ACTION_TEST_MODE: true

.github/workflows/__cpp-deptrace-disabled.yml

@@ -1,73 +0,0 @@
-# Warning: This file is generated automatically, and should not be modified.
-# Instead, please modify the template in the pr-checks directory and run:
-#     (cd pr-checks; pip install ruamel.yaml@0.17.31 && python3 sync.py)
-# to regenerate this file.
-
-name: 'PR Check - C/C++: disabling autoinstalling dependencies (Linux)'
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  GO111MODULE: auto
-on:
-  push:
-    branches:
-      - main
-      - releases/v*
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
-  workflow_dispatch: {}
-jobs:
-  cpp-deptrace-disabled:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-latest
-            version: linked
-          - os: ubuntu-latest
-            version: default
-          - os: ubuntu-latest
-            version: nightly-latest
-    name: 'C/C++: disabling autoinstalling dependencies (Linux)'
-    permissions:
-      contents: read
-      security-events: read
-    timeout-minutes: 45
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
-      - name: Test setup
-        shell: bash
-        run: |
-          cp -a ../action/tests/cpp-autobuild autobuild-dir
-      - uses: ./../action/init
-        with:
-          languages: cpp
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
-      - uses: ./../action/autobuild
-        with:
-          working-directory: autobuild-dir
-        env:
-          CODEQL_EXTRACTOR_CPP_AUTOINSTALL_DEPENDENCIES: false
-      - shell: bash
-        run: |
-          if ls /usr/bin/errno; then
-            echo "C/C++ autobuild installed errno, but it should not have since auto-install dependencies is disabled."
-            exit 1
-          fi
-    env:
-      DOTNET_GENERATE_ASPNET_CERTIFICATE: 'false'
-      CODEQL_ACTION_TEST_MODE: true

.github/workflows/__cpp-deptrace-enabled-on-macos.yml

@@ -1,71 +0,0 @@
-# Warning: This file is generated automatically, and should not be modified.
-# Instead, please modify the template in the pr-checks directory and run:
-#     (cd pr-checks; pip install ruamel.yaml@0.17.31 && python3 sync.py)
-# to regenerate this file.
-
-name: 'PR Check - C/C++: autoinstalling dependencies is skipped (macOS)'
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  GO111MODULE: auto
-on:
-  push:
-    branches:
-      - main
-      - releases/v*
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
-  workflow_dispatch: {}
-jobs:
-  cpp-deptrace-enabled-on-macos:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: macos-latest
-            version: nightly-latest
-    name: 'C/C++: autoinstalling dependencies is skipped (macOS)'
-    permissions:
-      contents: read
-      security-events: read
-    timeout-minutes: 45
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
-      - name: Test setup
-        shell: bash
-        run: |
-          cp -a ../action/tests/cpp-autobuild autobuild-dir
-      - uses: ./../action/init
-        with:
-          languages: cpp
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
-      - uses: ./../action/autobuild
-        with:
-          working-directory: autobuild-dir
-        env:
-          CODEQL_EXTRACTOR_CPP_AUTOINSTALL_DEPENDENCIES: true
-      - shell: bash
-        run: |
-          if ! ls /usr/bin/errno; then
-            echo "As expected, CODEQL_EXTRACTOR_CPP_AUTOINSTALL_DEPENDENCIES is a no-op on macOS"
-          else
-            echo "CODEQL_EXTRACTOR_CPP_AUTOINSTALL_DEPENDENCIES should not have had any effect on macOS"
-            exit 1
-          fi
-    env:
-      DOTNET_GENERATE_ASPNET_CERTIFICATE: 'false'
-      CODEQL_ACTION_TEST_MODE: true

.github/workflows/__cpp-deptrace-enabled.yml

@@ -1,73 +0,0 @@
-# Warning: This file is generated automatically, and should not be modified.
-# Instead, please modify the template in the pr-checks directory and run:
-#     (cd pr-checks; pip install ruamel.yaml@0.17.31 && python3 sync.py)
-# to regenerate this file.
-
-name: 'PR Check - C/C++: autoinstalling dependencies (Linux)'
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  GO111MODULE: auto
-on:
-  push:
-    branches:
-      - main
-      - releases/v*
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
-  workflow_dispatch: {}
-jobs:
-  cpp-deptrace-enabled:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-latest
-            version: linked
-          - os: ubuntu-latest
-            version: default
-          - os: ubuntu-latest
-            version: nightly-latest
-    name: 'C/C++: autoinstalling dependencies (Linux)'
-    permissions:
-      contents: read
-      security-events: read
-    timeout-minutes: 45
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
-      - name: Test setup
-        shell: bash
-        run: |
-          cp -a ../action/tests/cpp-autobuild autobuild-dir
-      - uses: ./../action/init
-        with:
-          languages: cpp
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
-      - uses: ./../action/autobuild
-        with:
-          working-directory: autobuild-dir
-        env:
-          CODEQL_EXTRACTOR_CPP_AUTOINSTALL_DEPENDENCIES: true
-      - shell: bash
-        run: |
-          if ! ls /usr/bin/errno; then
-            echo "Did not autoinstall errno"
-            exit 1
-          fi
-    env:
-      DOTNET_GENERATE_ASPNET_CERTIFICATE: 'false'
-      CODEQL_ACTION_TEST_MODE: true

.github/workflows/__diagnostics-export.yml

@@ -7,131 +7,146 @@ name: PR Check - Diagnostic export
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GO111MODULE: auto
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v2
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   diagnostics-export:
     strategy:
-      fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: linked
+          version: stable-20230317
-          - os: macos-latest
+        - os: macos-latest
-            version: linked
+          version: stable-20230317
-          - os: windows-latest
+        - os: windows-latest
-            version: linked
+          version: stable-20230317
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: nightly-latest
+          version: latest
-          - os: macos-latest
+        - os: macos-latest
-            version: nightly-latest
+          version: latest
-          - os: windows-latest
+        - os: windows-latest
-            version: nightly-latest
+          version: latest
+        - os: ubuntu-latest
+          version: nightly-latest
+        - os: macos-latest
+          version: nightly-latest
+        - os: windows-latest
+          version: nightly-latest
     name: Diagnostic export
     permissions:
       contents: read
-      security-events: read
+      security-events: write
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Check out repository
+    - name: Check out repository
-        uses: actions/checkout@v4
+      uses: actions/checkout@v4
-      - name: Prepare test
+    - name: Prepare test
-        id: prepare-test
+      id: prepare-test
-        uses: ./.github/actions/prepare-test
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          version: ${{ matrix.version }}
+        version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
+        use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
+    - name: Set environment variable for Swift enablement
-      - uses: ./../action/init
+      if: >-
-        id: init
+        runner.os != 'Windows' && (
-        with:
+            matrix.version == '20220908' ||
-          languages: javascript
+            matrix.version == '20221211'
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+        )
-      - name: Add test diagnostics
+      shell: bash
-        shell: bash
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-        env:
+    - uses: ./../action/init
-          CODEQL_PATH: ${{ steps.init.outputs.codeql-path }}
+      id: init
-        run: |
+      with:
+        languages: javascript
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
+    - name: Add test diagnostics
+      shell: bash
+      env:
+        CODEQL_PATH: ${{ steps.init.outputs.codeql-path }}
+      run: |
+        for i in {1..2}; do
+          # Use the same location twice to test the workaround for the bug in CodeQL CLI 2.12.5 that
+          # produces an invalid diagnostic with multiple identical location objects.
           "$CODEQL_PATH" database add-diagnostic \
             "$RUNNER_TEMP/codeql_databases/javascript" \
             --file-path /path/to/file \
-            --plaintext-message "Plaintext message" \
+            --plaintext-message "Plaintext message $i" \
             --source-id "lang/diagnostics/example" \
             --source-name "Diagnostic name" \
             --ready-for-status-page
-      - uses: ./../action/analyze
+        done
-        with:
+    - uses: ./../action/analyze
-          output: ${{ runner.temp }}/results
+      with:
-          upload-database: false
+        output: ${{ runner.temp }}/results
-      - name: Upload SARIF
+        upload-database: false
-        uses: actions/upload-artifact@v4
+    - name: Upload SARIF
-        with:
+      uses: actions/upload-artifact@v3
-          name: diagnostics-export-${{ matrix.os }}-${{ matrix.version }}.sarif.json
+      with:
-          path: ${{ runner.temp }}/results/javascript.sarif
+        name: diagnostics-export-${{ matrix.os }}-${{ matrix.version }}.sarif.json
-          retention-days: 7
+        path: ${{ runner.temp }}/results/javascript.sarif
-      - name: Check diagnostics appear in SARIF
+        retention-days: 7
-        uses: actions/github-script@v7
+    - name: Check diagnostics appear in SARIF
-        env:
+      uses: actions/github-script@v6
-          SARIF_PATH: ${{ runner.temp }}/results/javascript.sarif
+      env:
-        with:
+        SARIF_PATH: ${{ runner.temp }}/results/javascript.sarif
-          script: |
+      with:
-            const fs = require('fs');
+        script: |
+          const fs = require('fs');
 
-            function checkStatusPageNotification(n) {
+          function checkStatusPageNotification(n) {
-              const expectedMessage = 'Plaintext message';
+            const expectedMessage = 'Plaintext message 1\n\nCodeQL also found 1 other diagnostic like this. See the workflow log for details.';
-              if (n.message.text !== expectedMessage) {
+            if (n.message.text !== expectedMessage) {
-                core.setFailed(`Expected the status page diagnostic to have the message '${expectedMessage}', but found '${n.message.text}'.`);
+              core.setFailed(`Expected the status page diagnostic to have the message '${expectedMessage}', but found '${n.message.text}'.`);
-              }
-              if (n.locations.length !== 1) {
-                core.setFailed(`Expected the status page diagnostic to have exactly 1 location, but found ${n.locations.length}.`);
-              }
             }
+            if (n.locations.length !== 1) {
+              core.setFailed(`Expected the status page diagnostic to have exactly 1 location, but found ${n.locations.length}.`);
+            }
+          }
 
-            const sarif = JSON.parse(fs.readFileSync(process.env['SARIF_PATH'], 'utf8'));
+          const sarif = JSON.parse(fs.readFileSync(process.env['SARIF_PATH'], 'utf8'));
-            const run = sarif.runs[0];
+          const run = sarif.runs[0];
 
-            const toolExecutionNotifications = run.invocations[0].toolExecutionNotifications;
+          const toolExecutionNotifications = run.invocations[0].toolExecutionNotifications;
-            const statusPageNotifications = toolExecutionNotifications.filter(n =>
+          const statusPageNotifications = toolExecutionNotifications.filter(n =>
-              n.descriptor.id === 'lang/diagnostics/example' && n.properties?.visibility?.statusPage
+            n.descriptor.id === 'lang/diagnostics/example' && n.properties?.visibility?.statusPage
+          );
+          if (statusPageNotifications.length !== 1) {
+            core.setFailed(
+              'Expected exactly one status page reporting descriptor for this diagnostic in the ' +
+                `'runs[].invocations[].toolExecutionNotifications[]' SARIF property, but found ` +
+                `${statusPageNotifications.length}. All notification reporting descriptors: ` + 
+                `${JSON.stringify(toolExecutionNotifications)}.`
             );
-            if (statusPageNotifications.length !== 1) {
+          }
-              core.setFailed(
+          checkStatusPageNotification(statusPageNotifications[0]);
-                'Expected exactly one status page reporting descriptor for this diagnostic in the ' +
-                  `'runs[].invocations[].toolExecutionNotifications[]' SARIF property, but found ` +
-                  `${statusPageNotifications.length}. All notification reporting descriptors: ` +
-                  `${JSON.stringify(toolExecutionNotifications)}.`
-              );
-            }
-            checkStatusPageNotification(statusPageNotifications[0]);
 
-            const notifications = run.tool.driver.notifications;
+          const notifications = run.tool.driver.notifications;
-            const diagnosticNotification = notifications.filter(n =>
+          const diagnosticNotification = notifications.filter(n =>
-              n.id === 'lang/diagnostics/example' && n.name === 'lang/diagnostics/example' &&
+            n.id === 'lang/diagnostics/example' && n.name === 'lang/diagnostics/example' &&
-                n.fullDescription.text === 'Diagnostic name'
+              n.fullDescription.text === 'Diagnostic name'
+          );
+          if (diagnosticNotification.length !== 1) {
+            core.setFailed(
+              'Expected exactly one notification for this diagnostic in the ' +
+                `'runs[].tool.driver.notifications[]' SARIF property, but found ` +
+                `${diagnosticNotification.length}. All notifications: ` +
+                `${JSON.stringify(notifications)}.`
             );
-            if (diagnosticNotification.length !== 1) {
+          }
-              core.setFailed(
-                'Expected exactly one notification for this diagnostic in the ' +
-                  `'runs[].tool.driver.notifications[]' SARIF property, but found ` +
-                  `${diagnosticNotification.length}. All notifications: ` +
-                  `${JSON.stringify(notifications)}.`
-              );
-            }
 
-            core.info('Finished diagnostic export test');
+          core.info('Finished diagnostic export test');
     env:
       CODEQL_ACTION_EXPORT_DIAGNOSTICS: true
       CODEQL_ACTION_TEST_MODE: true

.github/workflows/__export-file-baseline-information.yml

@@ -7,89 +7,96 @@ name: PR Check - Export file baseline information
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GO111MODULE: auto
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v2
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   export-file-baseline-information:
     strategy:
-      fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: nightly-latest
+          version: nightly-latest
-          - os: macos-latest
+        - os: macos-latest
-            version: nightly-latest
+          version: nightly-latest
-          - os: windows-latest
+        - os: windows-latest
-            version: nightly-latest
+          version: nightly-latest
     name: Export file baseline information
     permissions:
       contents: read
-      security-events: read
+      security-events: write
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Check out repository
+    - name: Check out repository
-        uses: actions/checkout@v4
+      uses: actions/checkout@v4
-      - name: Prepare test
+    - name: Prepare test
-        id: prepare-test
+      id: prepare-test
-        uses: ./.github/actions/prepare-test
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          version: ${{ matrix.version }}
+        version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
+        use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
+    - name: Set environment variable for Swift enablement
-      - uses: ./../action/init
+      if: >-
-        id: init
+        runner.os != 'Windows' && (
-        with:
+            matrix.version == '20220908' ||
-          languages: javascript
+            matrix.version == '20221211'
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+        )
-      - uses: ./../action/.github/actions/setup-swift
+      shell: bash
-        if: runner.os == 'macOS'
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-        with:
+    - uses: ./../action/init
-          codeql-path: ${{ steps.init.outputs.codeql-path }}
+      id: init
-      - name: Build code
+      with:
-        shell: bash
+        languages: javascript
-        run: ./build.sh
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
-      - uses: ./../action/analyze
+      env:
-        with:
+        CODEQL_FILE_BASELINE_INFORMATION: true
-          output: ${{ runner.temp }}/results
+    - uses: ./../action/.github/actions/setup-swift
-      - name: Upload SARIF
+      with:
-        uses: actions/upload-artifact@v4
+        codeql-path: ${{ steps.init.outputs.codeql-path }}
-        with:
+    - name: Build code
-          name: with-baseline-information-${{ matrix.os }}-${{ matrix.version }}.sarif.json
+      shell: bash
-          path: ${{ runner.temp }}/results/javascript.sarif
+      run: ./build.sh
-          retention-days: 7
+    - uses: ./../action/analyze
-      - name: Check results
+      with:
-        shell: bash
+        output: ${{ runner.temp }}/results
-        run: |
+      env:
-          cd "$RUNNER_TEMP/results"
+        CODEQL_FILE_BASELINE_INFORMATION: true
-          expected_baseline_languages="c csharp go java kotlin javascript python ruby"
+    - name: Upload SARIF
-          if [[ $RUNNER_OS == "macOS" ]]; then
+      uses: actions/upload-artifact@v3
-            expected_baseline_languages+=" swift"
+      with:
-          fi
+        name: with-baseline-information-${{ matrix.os }}-${{ matrix.version }}.sarif.json
+        path: ${{ runner.temp }}/results/javascript.sarif
+        retention-days: 7
+    - name: Check results
+      shell: bash
+      run: |
+        cd "$RUNNER_TEMP/results"
+        expected_baseline_languages="cpp cs go java js py rb"
+        if [[ $RUNNER_OS != "Windows" ]]; then
+          expected_baseline_languages+=" swift"
+        fi
 
-          for lang in ${expected_baseline_languages}; do
+        for lang in ${expected_baseline_languages}; do
-            rule_name="cli/expected-extracted-files/${lang}"
+          rule_name="${lang}/baseline/expected-extracted-files"
-            found_notification=$(jq --arg rule_name "${rule_name}" '[.runs[0].tool.driver.notifications |
+          found_notification=$(jq --arg rule_name "${rule_name}" '[.runs[0].tool.driver.notifications |
-              select(. != null) | flatten | .[].id] | any(. == $rule_name)' javascript.sarif)
+            select(. != null) | flatten | .[].id] | any(. == $rule_name)' javascript.sarif)
-            if [[ "${found_notification}" != "true" ]]; then
+          if [[ "${found_notification}" != "true" ]]; then
-              echo "Expected SARIF output to contain notification '${rule_name}', but found no such notification."
+            echo "Expected SARIF output to contain notification '${rule_name}', but found no such notification."
-              exit 1
+            exit 1
-            else
+          else
-              echo "Found notification '${rule_name}'."
+            echo "Found notification '${rule_name}'."
-            fi
+          fi
-          done
+        done
     env:
-      CODEQL_ACTION_SUBLANGUAGE_FILE_COVERAGE: true
       CODEQL_ACTION_TEST_MODE: true

.github/workflows/__extract-direct-to-toolcache.yml

@@ -1,96 +0,0 @@
-# Warning: This file is generated automatically, and should not be modified.
-# Instead, please modify the template in the pr-checks directory and run:
-#     (cd pr-checks; pip install ruamel.yaml@0.17.31 && python3 sync.py)
-# to regenerate this file.
-
-name: PR Check - Extract directly to toolcache
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  GO111MODULE: auto
-on:
-  push:
-    branches:
-      - main
-      - releases/v*
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
-  workflow_dispatch: {}
-jobs:
-  extract-direct-to-toolcache:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: macos-latest
-            version: linked
-          - os: ubuntu-latest
-            version: linked
-          - os: windows-latest
-            version: linked
-    name: Extract directly to toolcache
-    permissions:
-      contents: read
-      security-events: read
-    timeout-minutes: 45
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
-      - name: Remove CodeQL from toolcache
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const fs = require('fs');
-            const path = require('path');
-            const codeqlPath = path.join(process.env['RUNNER_TOOL_CACHE'], 'CodeQL');
-            fs.rmdirSync(codeqlPath, { recursive: true });
-      - name: Install @actions/tool-cache
-        run: npm install @actions/tool-cache
-      - name: Check toolcache does not contain CodeQL
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const toolcache = require('@actions/tool-cache');
-            const allCodeqlVersions = toolcache.findAllVersions('CodeQL');
-            if (allCodeqlVersions.length !== 0) {
-              throw new Error(`CodeQL should not be found in the toolcache, but found ${allCodeqlVersions}`);
-            }
-            console.log('No versions of CodeQL found in the toolcache');
-      - id: init
-        uses: ./../action/init
-        with:
-          languages: javascript
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
-      - uses: ./../action/analyze
-        with:
-          output: ${{ runner.temp }}/results
-          upload-database: false
-      - name: Check CodeQL is installed within the toolcache
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const toolcache = require('@actions/tool-cache');
-            const allCodeqlVersions = toolcache.findAllVersions('CodeQL');
-            console.log(`Found CodeQL versions: ${allCodeqlVersions}`);
-            if (allCodeqlVersions.length === 0) {
-              throw new Error('CodeQL not found in toolcache');
-            }
-            if (allCodeqlVersions.length > 1) {
-              throw new Error('Multiple CodeQL versions found in toolcache');
-            }
-    env:
-      CODEQL_ACTION_EXTRACT_TOOLCACHE: true
-      CODEQL_ACTION_TEST_MODE: true

.github/workflows/__extractor-ram-threads.yml

@@ -7,67 +7,72 @@ name: PR Check - Extractor ram and threads options test
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GO111MODULE: auto
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v2
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   extractor-ram-threads:
     strategy:
-      fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: linked
+          version: latest
     name: Extractor ram and threads options test
     permissions:
       contents: read
-      security-events: read
+      security-events: write
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Check out repository
+    - name: Check out repository
-        uses: actions/checkout@v4
+      uses: actions/checkout@v4
-      - name: Prepare test
+    - name: Prepare test
-        id: prepare-test
+      id: prepare-test
-        uses: ./.github/actions/prepare-test
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          version: ${{ matrix.version }}
+        version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
+        use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
+    - name: Set environment variable for Swift enablement
-      - uses: ./../action/init
+      if: >-
-        with:
+        runner.os != 'Windows' && (
-          languages: java
+            matrix.version == '20220908' ||
-          ram: 230
+            matrix.version == '20221211'
-          threads: 1
+        )
-      - name: Assert Results
+      shell: bash
-        shell: bash
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-        run: |
+    - uses: ./../action/init
-          if [ "${CODEQL_RAM}" != "230" ]; then
+      with:
-            echo "CODEQL_RAM is '${CODEQL_RAM}' instead of 230"
+        languages: java
-            exit 1
+        ram: 230
-          fi
+        threads: 1
-          if [ "${CODEQL_EXTRACTOR_JAVA_RAM}" != "230" ]; then
+    - name: Assert Results
-            echo "CODEQL_EXTRACTOR_JAVA_RAM is '${CODEQL_EXTRACTOR_JAVA_RAM}' instead of 230"
+      shell: bash
-            exit 1
+      run: |
-          fi
+        if [ "${CODEQL_RAM}" != "230" ]; then
-          if [ "${CODEQL_THREADS}" != "1" ]; then
+          echo "CODEQL_RAM is '${CODEQL_RAM}' instead of 230"
-            echo "CODEQL_THREADS is '${CODEQL_THREADS}' instead of 1"
+          exit 1
-            exit 1
+        fi
-          fi
+        if [ "${CODEQL_EXTRACTOR_JAVA_RAM}" != "230" ]; then
-          if [ "${CODEQL_EXTRACTOR_JAVA_THREADS}" != "1" ]; then
+          echo "CODEQL_EXTRACTOR_JAVA_RAM is '${CODEQL_EXTRACTOR_JAVA_RAM}' instead of 230"
-            echo "CODEQL_EXTRACTOR_JAVA_THREADS is '${CODEQL_EXTRACTOR_JAVA_THREADS}' instead of 1"
+          exit 1
-            exit 1
+        fi
-          fi
+        if [ "${CODEQL_THREADS}" != "1" ]; then
+          echo "CODEQL_THREADS is '${CODEQL_THREADS}' instead of 1"
+          exit 1
+        fi
+        if [ "${CODEQL_EXTRACTOR_JAVA_THREADS}" != "1" ]; then
+          echo "CODEQL_EXTRACTOR_JAVA_THREADS is '${CODEQL_EXTRACTOR_JAVA_THREADS}' instead of 1"
+          exit 1
+        fi
     env:
       CODEQL_ACTION_TEST_MODE: true

.github/workflows/__go-custom-queries.yml

@@ -7,58 +7,106 @@ name: 'PR Check - Go: Custom queries'
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GO111MODULE: auto
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v2
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   go-custom-queries:
     strategy:
-      fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: linked
+          version: stable-20220908
-          - os: ubuntu-latest
+        - os: macos-latest
-            version: nightly-latest
+          version: stable-20220908
+        - os: windows-latest
+          version: stable-20220908
+        - os: ubuntu-latest
+          version: stable-20221211
+        - os: macos-latest
+          version: stable-20221211
+        - os: windows-latest
+          version: stable-20221211
+        - os: ubuntu-latest
+          version: stable-20230418
+        - os: macos-latest
+          version: stable-20230418
+        - os: windows-latest
+          version: stable-20230418
+        - os: ubuntu-latest
+          version: stable-v2.13.5
+        - os: macos-latest
+          version: stable-v2.13.5
+        - os: windows-latest
+          version: stable-v2.13.5
+        - os: ubuntu-latest
+          version: stable-v2.14.6
+        - os: macos-latest
+          version: stable-v2.14.6
+        - os: windows-latest
+          version: stable-v2.14.6
+        - os: ubuntu-latest
+          version: default
+        - os: macos-latest
+          version: default
+        - os: windows-latest
+          version: default
+        - os: ubuntu-latest
+          version: latest
+        - os: macos-latest
+          version: latest
+        - os: windows-latest
+          version: latest
+        - os: ubuntu-latest
+          version: nightly-latest
+        - os: macos-latest
+          version: nightly-latest
+        - os: windows-latest
+          version: nightly-latest
     name: 'Go: Custom queries'
     permissions:
       contents: read
-      security-events: read
+      security-events: write
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Check out repository
+    - name: Check out repository
-        uses: actions/checkout@v4
+      uses: actions/checkout@v4
-      - name: Prepare test
+    - name: Prepare test
-        id: prepare-test
+      id: prepare-test
-        uses: ./.github/actions/prepare-test
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          version: ${{ matrix.version }}
+        version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
+        use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
+    - name: Set environment variable for Swift enablement
-      - uses: actions/setup-go@v5
+      if: >-
-        with:
+        runner.os != 'Windows' && (
-          go-version: '>=1.21.0'
+            matrix.version == '20220908' ||
-      - uses: ./../action/init
+            matrix.version == '20221211'
-        with:
+        )
-          languages: go
+      shell: bash
-          config-file: ./.github/codeql/custom-queries.yml
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+    - uses: ./../action/init
-      - name: Build code
+      with:
-        shell: bash
+        languages: go
-        run: ./build.sh
+        config-file: ./.github/codeql/custom-queries.yml
-      - uses: ./../action/analyze
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
+    - name: Build code
+      shell: bash
+      run: ./build.sh
+    - uses: ./../action/analyze
+      with:
+        upload-database: false
     env:
       DOTNET_GENERATE_ASPNET_CERTIFICATE: 'false'
       CODEQL_ACTION_TEST_MODE: true

.github/workflows/__go-indirect-tracing-workaround-diagnostic.yml

@@ -7,85 +7,90 @@ name: 'PR Check - Go: diagnostic when Go is changed after init step'
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GO111MODULE: auto
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v2
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   go-indirect-tracing-workaround-diagnostic:
     strategy:
-      fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: default
+          version: stable-v2.14.6
     name: 'Go: diagnostic when Go is changed after init step'
     permissions:
       contents: read
-      security-events: read
+      security-events: write
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Check out repository
+    - name: Check out repository
-        uses: actions/checkout@v4
+      uses: actions/checkout@v4
-      - name: Prepare test
+    - name: Prepare test
-        id: prepare-test
+      id: prepare-test
-        uses: ./.github/actions/prepare-test
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          version: ${{ matrix.version }}
+        version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
+        use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
+    - name: Set environment variable for Swift enablement
-      - uses: actions/setup-go@v5
+      if: >-
-        with:
+        runner.os != 'Windows' && (
+            matrix.version == '20220908' ||
+            matrix.version == '20221211'
+        )
+      shell: bash
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
+    - uses: actions/setup-go@v4
+      with:
       # We need a Go version that ships with statically linked binaries on Linux
-          go-version: '>=1.21.0'
+        go-version: '>=1.21.0'
-      - uses: ./../action/init
+    - uses: ./../action/init
-        with:
+      with:
-          languages: go
+        languages: go
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
   # Deliberately change Go after the `init` step
-      - uses: actions/setup-go@v5
+    - uses: actions/setup-go@v4
-        with:
+      with:
-          go-version: '1.20'
+        go-version: '1.20'
-      - name: Build code
+    - name: Build code
-        shell: bash
+      shell: bash
-        run: go build main.go
+      run: go build main.go
-      - uses: ./../action/analyze
+    - uses: ./../action/analyze
-        with:
+      with:
-          output: ${{ runner.temp }}/results
+        output: ${{ runner.temp }}/results
-          upload-database: false
+        upload-database: false
-      - name: Check diagnostic appears in SARIF
+    - name: Check diagnostic appears in SARIF
-        uses: actions/github-script@v7
+      uses: actions/github-script@v6
-        env:
+      env:
-          SARIF_PATH: ${{ runner.temp }}/results/go.sarif
+        SARIF_PATH: ${{ runner.temp }}/results/go.sarif
-        with:
+      with:
-          script: |
+        script: |
-            const fs = require('fs');
+          const fs = require('fs');
 
-            const sarif = JSON.parse(fs.readFileSync(process.env['SARIF_PATH'], 'utf8'));
+          const sarif = JSON.parse(fs.readFileSync(process.env['SARIF_PATH'], 'utf8'));
-            const run = sarif.runs[0];
+          const run = sarif.runs[0];
 
-            const toolExecutionNotifications = run.invocations[0].toolExecutionNotifications;
+          const toolExecutionNotifications = run.invocations[0].toolExecutionNotifications;
-            const statusPageNotifications = toolExecutionNotifications.filter(n =>
+          const statusPageNotifications = toolExecutionNotifications.filter(n =>
-              n.descriptor.id === 'go/workflow/go-installed-after-codeql-init' && n.properties?.visibility?.statusPage
+            n.descriptor.id === 'go/workflow/go-installed-after-codeql-init' && n.properties?.visibility?.statusPage
+          );
+          if (statusPageNotifications.length !== 1) {
+            core.setFailed(
+              'Expected exactly one status page reporting descriptor for this diagnostic in the ' +
+                `'runs[].invocations[].toolExecutionNotifications[]' SARIF property, but found ` +
+                `${statusPageNotifications.length}. All notification reporting descriptors: ` +
+                `${JSON.stringify(toolExecutionNotifications)}.`
             );
-            if (statusPageNotifications.length !== 1) {
+          }
-              core.setFailed(
-                'Expected exactly one status page reporting descriptor for this diagnostic in the ' +
-                  `'runs[].invocations[].toolExecutionNotifications[]' SARIF property, but found ` +
-                  `${statusPageNotifications.length}. All notification reporting descriptors: ` +
-                  `${JSON.stringify(toolExecutionNotifications)}.`
-              );
-            }
     env:
       CODEQL_ACTION_TEST_MODE: true

.github/workflows/__go-indirect-tracing-workaround-no-file-program.yml

@@ -1,92 +0,0 @@
-# Warning: This file is generated automatically, and should not be modified.
-# Instead, please modify the template in the pr-checks directory and run:
-#     (cd pr-checks; pip install ruamel.yaml@0.17.31 && python3 sync.py)
-# to regenerate this file.
-
-name: 'PR Check - Go: diagnostic when `file` is not installed'
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  GO111MODULE: auto
-on:
-  push:
-    branches:
-      - main
-      - releases/v*
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
-  workflow_dispatch: {}
-jobs:
-  go-indirect-tracing-workaround-no-file-program:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-latest
-            version: default
-    name: 'Go: diagnostic when `file` is not installed'
-    permissions:
-      contents: read
-      security-events: read
-    timeout-minutes: 45
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
-      - uses: actions/setup-go@v5
-        with:
-      # We need a Go version that ships with statically linked binaries on Linux
-          go-version: '>=1.21.0'
-      - name: Remove `file` program
-        run: |
-          echo $(which file)
-          sudo rm -rf $(which file)
-          echo $(which file)
-      - uses: ./../action/init
-        with:
-          languages: go
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
-      - name: Build code
-        shell: bash
-        run: go build main.go
-      - uses: ./../action/analyze
-        with:
-          output: ${{ runner.temp }}/results
-          upload-database: false
-      - name: Check diagnostic appears in SARIF
-        uses: actions/github-script@v7
-        env:
-          SARIF_PATH: ${{ runner.temp }}/results/go.sarif
-        with:
-          script: |
-            const fs = require('fs');
-
-            const sarif = JSON.parse(fs.readFileSync(process.env['SARIF_PATH'], 'utf8'));
-            const run = sarif.runs[0];
-
-            const toolExecutionNotifications = run.invocations[0].toolExecutionNotifications;
-            const statusPageNotifications = toolExecutionNotifications.filter(n =>
-              n.descriptor.id === 'go/workflow/file-program-unavailable' && n.properties?.visibility?.statusPage
-            );
-            if (statusPageNotifications.length !== 1) {
-              core.setFailed(
-                'Expected exactly one status page reporting descriptor for this diagnostic in the ' +
-                  `'runs[].invocations[].toolExecutionNotifications[]' SARIF property, but found ` +
-                  `${statusPageNotifications.length}. All notification reporting descriptors: ` +
-                  `${JSON.stringify(toolExecutionNotifications)}.`
-              );
-            }
-    env:
-      CODEQL_ACTION_TEST_MODE: true

.github/workflows/__go-indirect-tracing-workaround.yml

@@ -7,81 +7,88 @@ name: 'PR Check - Go: workaround for indirect tracing'
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GO111MODULE: auto
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v2
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   go-indirect-tracing-workaround:
     strategy:
-      fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: default
+          version: stable-v2.14.6
     name: 'Go: workaround for indirect tracing'
     permissions:
       contents: read
-      security-events: read
+      security-events: write
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Check out repository
+    - name: Check out repository
-        uses: actions/checkout@v4
+      uses: actions/checkout@v4
-      - name: Prepare test
+    - name: Prepare test
-        id: prepare-test
+      id: prepare-test
-        uses: ./.github/actions/prepare-test
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          version: ${{ matrix.version }}
+        version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
+        use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
+    - name: Set environment variable for Swift enablement
-      - uses: actions/setup-go@v5
+      if: >-
-        with:
+        runner.os != 'Windows' && (
+            matrix.version == '20220908' ||
+            matrix.version == '20221211'
+        )
+      shell: bash
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
+    - uses: actions/setup-go@v4
+      with:
       # We need a Go version that ships with statically linked binaries on Linux
-          go-version: '>=1.21.0'
+        go-version: '>=1.21.0'
-      - uses: ./../action/init
+    - uses: ./../action/init
-        with:
+      with:
-          languages: go
+        languages: go
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
-      - name: Build code
+    - name: Build code
-        shell: bash
+      shell: bash
-        run: go build main.go
+      run: go build main.go
-      - uses: ./../action/analyze
+    - uses: ./../action/analyze
-      - shell: bash
+      with:
-        run: |
+        upload-database: false
-          if [[ -z "${CODEQL_ACTION_GO_BINARY}" ]]; then
+    - shell: bash
-            echo "Expected the workaround for indirect tracing of static binaries to trigger, but the" \
+      run: |
-              "CODEQL_ACTION_GO_BINARY environment variable is not set."
+        if [[ -z "${CODEQL_ACTION_GO_BINARY}" ]]; then
-            exit 1
+          echo "Expected the workaround for indirect tracing of static binaries to trigger, but the" \
-          fi
+            "CODEQL_ACTION_GO_BINARY environment variable is not set."
-          if [[ ! -f "${CODEQL_ACTION_GO_BINARY}" ]]; then
+          exit 1
-            echo "CODEQL_ACTION_GO_BINARY is set, but the corresponding script does not exist."
+        fi
-            exit 1
+        if [[ ! -f "${CODEQL_ACTION_GO_BINARY}" ]]; then
-          fi
+          echo "CODEQL_ACTION_GO_BINARY is set, but the corresponding script does not exist."
+          exit 1
+        fi
 
 
-          # Once we start running Bash 4.2 in all environments, we can replace the
+        # Once we start running Bash 4.2 in all environments, we can replace the
-          # `! -z` flag with the more elegant `-v` which confirms that the variable
+        # `! -z` flag with the more elegant `-v` which confirms that the variable
-          # is actually unset and not potentially set to a blank value.
+        # is actually unset and not potentially set to a blank value.
-          if [[ ! -z "${CODEQL_ACTION_DID_AUTOBUILD_GOLANG}" ]]; then
+        if [[ ! -z "${CODEQL_ACTION_DID_AUTOBUILD_GOLANG}" ]]; then
-            echo "Expected the Go autobuilder not to be run, but the" \
+          echo "Expected the Go autobuilder not to be run, but the" \
-              "CODEQL_ACTION_DID_AUTOBUILD_GOLANG environment variable was set."
+            "CODEQL_ACTION_DID_AUTOBUILD_GOLANG environment variable was set."
-            exit 1
+          exit 1
-          fi
+        fi
-          cd "$RUNNER_TEMP/codeql_databases"
+        cd "$RUNNER_TEMP/codeql_databases"
-          if [[ ! -d go ]]; then
+        if [[ ! -d go ]]; then
-            echo "Did not find a Go database"
+          echo "Did not find a Go database"
-            exit 1
+          exit 1
-          fi
+        fi
     env:
       CODEQL_ACTION_TEST_MODE: true

.github/workflows/__go-tracing-autobuilder.yml

@@ -7,98 +7,102 @@ name: 'PR Check - Go: tracing with autobuilder step'
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GO111MODULE: auto
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v2
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   go-tracing-autobuilder:
     strategy:
-      fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.15.5
+          version: stable-20220908
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.15.5
+          version: stable-20220908
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.16.6
+          version: stable-20221211
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.16.6
+          version: stable-20221211
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.17.6
+          version: stable-20230418
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.17.6
+          version: stable-20230418
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.18.4
+          version: stable-v2.13.5
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.18.4
+          version: stable-v2.13.5
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.19.4
+          version: stable-v2.14.6
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.19.4
+          version: stable-v2.14.6
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: default
+          version: default
-          - os: macos-latest
+        - os: macos-latest
-            version: default
+          version: default
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: linked
+          version: latest
-          - os: macos-latest
+        - os: macos-latest
-            version: linked
+          version: latest
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: nightly-latest
+          version: nightly-latest
-          - os: macos-latest
+        - os: macos-latest
-            version: nightly-latest
+          version: nightly-latest
     name: 'Go: tracing with autobuilder step'
     permissions:
       contents: read
-      security-events: read
+      security-events: write
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Check out repository
+    - name: Check out repository
-        uses: actions/checkout@v4
+      uses: actions/checkout@v4
-      - name: Prepare test
+    - name: Prepare test
-        id: prepare-test
+      id: prepare-test
-        uses: ./.github/actions/prepare-test
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          version: ${{ matrix.version }}
+        version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
+        use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
+    - name: Set environment variable for Swift enablement
-      - uses: actions/setup-go@v5
+      if: >-
-        with:
+        runner.os != 'Windows' && (
-          go-version: ~1.24.0
+            matrix.version == '20220908' ||
-      # to avoid potentially misleading autobuilder results where we expect it to download
+            matrix.version == '20221211'
-      # dependencies successfully, but they actually come from a warm cache
+        )
-          cache: false
+      shell: bash
-      - uses: ./../action/init
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-        with:
+    - uses: actions/setup-go@v4
-          languages: go
+      with:
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+        go-version: ~1.21.1
-      - uses: ./../action/autobuild
+    - uses: ./../action/init
-      - uses: ./../action/analyze
+      with:
-      - shell: bash
+        languages: go
-        run: |
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
-          if [[ "${CODEQL_ACTION_DID_AUTOBUILD_GOLANG}" != true ]]; then
+    - uses: ./../action/autobuild
-            echo "Expected the Go autobuilder to be run, but the" \
+    - uses: ./../action/analyze
-              "CODEQL_ACTION_DID_AUTOBUILD_GOLANG environment variable was not true."
+      with:
-            exit 1
+        upload-database: false
-          fi
+    - shell: bash
-          cd "$RUNNER_TEMP/codeql_databases"
+      run: |
-          if [[ ! -d go ]]; then
+        if [[ "${CODEQL_ACTION_DID_AUTOBUILD_GOLANG}" != true ]]; then
-            echo "Did not find a Go database"
+          echo "Expected the Go autobuilder to be run, but the" \
-            exit 1
+            "CODEQL_ACTION_DID_AUTOBUILD_GOLANG environment variable was not true."
-          fi
+          exit 1
+        fi
+        cd "$RUNNER_TEMP/codeql_databases"
+        if [[ ! -d go ]]; then
+          echo "Did not find a Go database"
+          exit 1
+        fi
     env:
       DOTNET_GENERATE_ASPNET_CERTIFICATE: 'false'
       CODEQL_ACTION_TEST_MODE: true

.github/workflows/__go-tracing-custom-build-steps.yml

@@ -7,102 +7,106 @@ name: 'PR Check - Go: tracing with custom build steps'
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GO111MODULE: auto
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v2
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   go-tracing-custom-build-steps:
     strategy:
-      fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.15.5
+          version: stable-20220908
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.15.5
+          version: stable-20220908
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.16.6
+          version: stable-20221211
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.16.6
+          version: stable-20221211
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.17.6
+          version: stable-20230418
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.17.6
+          version: stable-20230418
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.18.4
+          version: stable-v2.13.5
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.18.4
+          version: stable-v2.13.5
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.19.4
+          version: stable-v2.14.6
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.19.4
+          version: stable-v2.14.6
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: default
+          version: default
-          - os: macos-latest
+        - os: macos-latest
-            version: default
+          version: default
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: linked
+          version: latest
-          - os: macos-latest
+        - os: macos-latest
-            version: linked
+          version: latest
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: nightly-latest
+          version: nightly-latest
-          - os: macos-latest
+        - os: macos-latest
-            version: nightly-latest
+          version: nightly-latest
     name: 'Go: tracing with custom build steps'
     permissions:
       contents: read
-      security-events: read
+      security-events: write
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Check out repository
+    - name: Check out repository
-        uses: actions/checkout@v4
+      uses: actions/checkout@v4
-      - name: Prepare test
+    - name: Prepare test
-        id: prepare-test
+      id: prepare-test
-        uses: ./.github/actions/prepare-test
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          version: ${{ matrix.version }}
+        version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
+        use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
+    - name: Set environment variable for Swift enablement
-      - uses: actions/setup-go@v5
+      if: >-
-        with:
+        runner.os != 'Windows' && (
-          go-version: ~1.24.0
+            matrix.version == '20220908' ||
-      # to avoid potentially misleading autobuilder results where we expect it to download
+            matrix.version == '20221211'
-      # dependencies successfully, but they actually come from a warm cache
+        )
-          cache: false
+      shell: bash
-      - uses: ./../action/init
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-        with:
+    - uses: actions/setup-go@v4
-          languages: go
+      with:
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+        go-version: ~1.21.1
-      - name: Build code
+    - uses: ./../action/init
-        shell: bash
+      with:
-        run: go build main.go
+        languages: go
-      - uses: ./../action/analyze
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
-      - shell: bash
+    - name: Build code
-        run: |
+      shell: bash
-          # Once we start running Bash 4.2 in all environments, we can replace the
+      run: go build main.go
-          # `! -z` flag with the more elegant `-v` which confirms that the variable
+    - uses: ./../action/analyze
-          # is actually unset and not potentially set to a blank value.
+      with:
-          if [[ ! -z "${CODEQL_ACTION_DID_AUTOBUILD_GOLANG}" ]]; then
+        upload-database: false
-            echo "Expected the Go autobuilder not to be run, but the" \
+    - shell: bash
-              "CODEQL_ACTION_DID_AUTOBUILD_GOLANG environment variable was set."
+      run: |
-            exit 1
+        # Once we start running Bash 4.2 in all environments, we can replace the
-          fi
+        # `! -z` flag with the more elegant `-v` which confirms that the variable
-          cd "$RUNNER_TEMP/codeql_databases"
+        # is actually unset and not potentially set to a blank value.
-          if [[ ! -d go ]]; then
+        if [[ ! -z "${CODEQL_ACTION_DID_AUTOBUILD_GOLANG}" ]]; then
-            echo "Did not find a Go database"
+          echo "Expected the Go autobuilder not to be run, but the" \
-            exit 1
+            "CODEQL_ACTION_DID_AUTOBUILD_GOLANG environment variable was set."
-          fi
+          exit 1
+        fi
+        cd "$RUNNER_TEMP/codeql_databases"
+        if [[ ! -d go ]]; then
+          echo "Did not find a Go database"
+          exit 1
+        fi
     env:
       CODEQL_ACTION_TEST_MODE: true

.github/workflows/__go-tracing-legacy-workflow.yml

@@ -7,92 +7,96 @@ name: 'PR Check - Go: tracing with legacy workflow'
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GO111MODULE: auto
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v2
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   go-tracing-legacy-workflow:
     strategy:
-      fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.15.5
+          version: stable-20220908
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.15.5
+          version: stable-20220908
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.16.6
+          version: stable-20221211
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.16.6
+          version: stable-20221211
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.17.6
+          version: stable-20230418
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.17.6
+          version: stable-20230418
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.18.4
+          version: stable-v2.13.5
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.18.4
+          version: stable-v2.13.5
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.19.4
+          version: stable-v2.14.6
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.19.4
+          version: stable-v2.14.6
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: default
+          version: default
-          - os: macos-latest
+        - os: macos-latest
-            version: default
+          version: default
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: linked
+          version: latest
-          - os: macos-latest
+        - os: macos-latest
-            version: linked
+          version: latest
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: nightly-latest
+          version: nightly-latest
-          - os: macos-latest
+        - os: macos-latest
-            version: nightly-latest
+          version: nightly-latest
     name: 'Go: tracing with legacy workflow'
     permissions:
       contents: read
-      security-events: read
+      security-events: write
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Check out repository
+    - name: Check out repository
-        uses: actions/checkout@v4
+      uses: actions/checkout@v4
-      - name: Prepare test
+    - name: Prepare test
-        id: prepare-test
+      id: prepare-test
-        uses: ./.github/actions/prepare-test
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          version: ${{ matrix.version }}
+        version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
+        use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
+    - name: Set environment variable for Swift enablement
-      - uses: actions/setup-go@v5
+      if: >-
-        with:
+        runner.os != 'Windows' && (
-          go-version: ~1.24.0
+            matrix.version == '20220908' ||
-      # to avoid potentially misleading autobuilder results where we expect it to download
+            matrix.version == '20221211'
-      # dependencies successfully, but they actually come from a warm cache
+        )
-          cache: false
+      shell: bash
-      - uses: ./../action/init
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-        with:
+    - uses: actions/setup-go@v4
-          languages: go
+      with:
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+        go-version: ~1.21.1
-      - uses: ./../action/analyze
+    - uses: ./../action/init
-      - shell: bash
+      with:
-        run: |
+        languages: go
-          cd "$RUNNER_TEMP/codeql_databases"
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
-          if [[ ! -d go ]]; then
+    - uses: ./../action/analyze
-            echo "Did not find a Go database"
+      with:
-            exit 1
+        upload-database: false
-          fi
+    - shell: bash
+      run: |
+        cd "$RUNNER_TEMP/codeql_databases"
+        if [[ ! -d go ]]; then
+          echo "Did not find a Go database"
+          exit 1
+        fi
     env:
       DOTNET_GENERATE_ASPNET_CERTIFICATE: 'false'
       CODEQL_ACTION_TEST_MODE: true

.github/workflows/__init-with-registries.yml

@@ -7,44 +7,42 @@ name: 'PR Check - Packaging: Download using registries'
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GO111MODULE: auto
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v2
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   init-with-registries:
     strategy:
-      fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: default
+          version: default
-          - os: macos-latest
+        - os: macos-latest
-            version: default
+          version: default
-          - os: windows-latest
+        - os: windows-latest
-            version: default
+          version: default
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: linked
+          version: latest
-          - os: macos-latest
+        - os: macos-latest
-            version: linked
+          version: latest
-          - os: windows-latest
+        - os: windows-latest
-            version: linked
+          version: latest
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: nightly-latest
+          version: nightly-latest
-          - os: macos-latest
+        - os: macos-latest
-            version: nightly-latest
+          version: nightly-latest
-          - os: windows-latest
+        - os: windows-latest
-            version: nightly-latest
+          version: nightly-latest
     name: 'Packaging: Download using registries'
     permissions:
       contents: read
@@ -53,77 +51,84 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Check out repository
+    - name: Check out repository
-        uses: actions/checkout@v4
+      uses: actions/checkout@v4
-      - name: Prepare test
+    - name: Prepare test
-        id: prepare-test
+      id: prepare-test
-        uses: ./.github/actions/prepare-test
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          version: ${{ matrix.version }}
+        version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
+        use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
+    - name: Set environment variable for Swift enablement
-      - name: Init with registries
+      if: >-
-        uses: ./../action/init
+        runner.os != 'Windows' && (
-        with:
+            matrix.version == '20220908' ||
-          db-location: ${{ runner.temp }}/customDbLocation
+            matrix.version == '20221211'
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+        )
-          config-file: ./.github/codeql/codeql-config-registries.yml
+      shell: bash
-          languages: javascript
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-          registries: |
+    - name: Init with registries
-            - url: "https://ghcr.io/v2/"
+      uses: ./../action/init
-              packages: "*/*"
+      with:
-              token: "${{ secrets.GITHUB_TOKEN }}"
+        db-location: ${{ runner.temp }}/customDbLocation
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
+        config-file: ./.github/codeql/codeql-config-registries.yml
+        languages: javascript
+        registries: |
+          - url: "https://ghcr.io/v2/"
+            packages: "*/*"
+            token: "${{ secrets.GITHUB_TOKEN }}"
 
-      - name: Verify packages installed
+    - name: Verify packages installed
-        shell: bash
+      shell: bash
-        run: |
+      run: |
-          PRIVATE_PACK="$HOME/.codeql/packages/codeql-testing/private-pack"
+        PRIVATE_PACK="$HOME/.codeql/packages/codeql-testing/private-pack"
-          CODEQL_PACK1="$HOME/.codeql/packages/codeql-testing/codeql-pack1"
+        CODEQL_PACK1="$HOME/.codeql/packages/codeql-testing/codeql-pack1"
 
-          if [[ -d $PRIVATE_PACK ]]
+        if [[ -d $PRIVATE_PACK ]]
-          then
+        then
-              echo "$PRIVATE_PACK was installed."
+            echo "$PRIVATE_PACK was installed."
-          else
+        else
-              echo "::error $PRIVATE_PACK pack was not installed."
+            echo "::error $PRIVATE_PACK pack was not installed."
-              exit 1
+            exit 1
-          fi
+        fi
 
-          if [[ -d $CODEQL_PACK1 ]]
+        if [[ -d $CODEQL_PACK1 ]]
-          then
+        then
-              echo "$CODEQL_PACK1 was installed."
+            echo "$CODEQL_PACK1 was installed."
-          else
+        else
-              echo "::error $CODEQL_PACK1 pack was not installed."
+            echo "::error $CODEQL_PACK1 pack was not installed."
-              exit 1
+            exit 1
-          fi
+        fi
 
-      - name: Verify qlconfig.yml file was created
+    - name: Verify qlconfig.yml file was created
-        shell: bash
+      shell: bash
-        run: |
+      run: |
-          QLCONFIG_PATH=$RUNNER_TEMP/qlconfig.yml
+        QLCONFIG_PATH=$RUNNER_TEMP/qlconfig.yml
-          echo "Expected qlconfig.yml file to be created at $QLCONFIG_PATH"
+        echo "Expected qlconfig.yml file to be created at $QLCONFIG_PATH"
-          if [[ -f $QLCONFIG_PATH ]]
+        if [[ -f $QLCONFIG_PATH ]]
-          then
+        then
-              echo "qlconfig.yml file was created."
+            echo "qlconfig.yml file was created."
-          else
+        else
-              echo "::error qlconfig.yml file was not created."
+            echo "::error qlconfig.yml file was not created."
-              exit 1
+            exit 1
-          fi
+        fi
 
-      - name: Verify contents of qlconfig.yml
+    - name: Verify contents of qlconfig.yml
     # yq is not available on windows
-        if: runner.os != 'Windows'
+      if: runner.os != 'Windows'
-        shell: bash
+      shell: bash
-        run: |
+      run: |
-          QLCONFIG_PATH=$RUNNER_TEMP/qlconfig.yml
+        QLCONFIG_PATH=$RUNNER_TEMP/qlconfig.yml
-          cat $QLCONFIG_PATH | yq -e '.registries[] | select(.url == "https://ghcr.io/v2/") | select(.packages == "*/*")'
+        cat $QLCONFIG_PATH | yq -e '.registries[] | select(.url == "https://ghcr.io/v2/") | select(.packages == "*/*")'
-          if [[ $? -eq 0 ]]
+        if [[ $? -eq 0 ]]
-          then
+        then
-              echo "Registry was added to qlconfig.yml file."
+            echo "Registry was added to qlconfig.yml file."
-          else
+        else
-              echo "::error Registry was not added to qlconfig.yml file."
+            echo "::error Registry was not added to qlconfig.yml file."
-              echo "Contents of qlconfig.yml file:"
+            echo "Contents of qlconfig.yml file:"
-              cat $QLCONFIG_PATH
+            cat $QLCONFIG_PATH
-              exit 1
+            exit 1
-          fi
+        fi
     env:
       CODEQL_ACTION_TEST_MODE: true

.github/workflows/__javascript-source-root.yml

@@ -7,68 +7,75 @@ name: PR Check - Custom source root
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GO111MODULE: auto
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v2
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   javascript-source-root:
     strategy:
-      fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: linked
+          version: latest
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: default
+          version: default
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: nightly-latest
+          version: nightly-latest
     name: Custom source root
     permissions:
       contents: read
-      security-events: read
+      security-events: write
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Check out repository
+    - name: Check out repository
-        uses: actions/checkout@v4
+      uses: actions/checkout@v4
-      - name: Prepare test
+    - name: Prepare test
-        id: prepare-test
+      id: prepare-test
-        uses: ./.github/actions/prepare-test
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          version: ${{ matrix.version }}
+        version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
+        use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
+    - name: Set environment variable for Swift enablement
-      - name: Move codeql-action
+      if: >-
-        shell: bash
+        runner.os != 'Windows' && (
-        run: |
+            matrix.version == '20220908' ||
-          mkdir ../new-source-root
+            matrix.version == '20221211'
-          mv * ../new-source-root
+        )
-      - uses: ./../action/init
+      shell: bash
-        with:
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-          languages: javascript
+    - name: Move codeql-action
-          source-root: ../new-source-root
+      shell: bash
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+      run: |
-      - uses: ./../action/analyze
+        mkdir ../new-source-root
-        with:
+        mv * ../new-source-root
-          skip-queries: true
+    - uses: ./../action/init
-      - name: Assert database exists
+      with:
-        shell: bash
+        languages: javascript
-        run: |
+        source-root: ../new-source-root
-          cd "$RUNNER_TEMP/codeql_databases"
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
-          if [[ ! -d javascript ]]; then
+    - uses: ./../action/analyze
-            echo "Did not find a JavaScript database"
+      with:
-            exit 1
+        upload-database: false
-          fi
+        skip-queries: true
+        upload: never
+    - name: Assert database exists
+      shell: bash
+      run: |
+        cd "$RUNNER_TEMP/codeql_databases"
+        if [[ ! -d javascript ]]; then
+          echo "Did not find a JavaScript database"
+          exit 1
+        fi
     env:
       CODEQL_ACTION_TEST_MODE: true

.github/workflows/__job-run-uuid-sarif.yml

@@ -1,74 +0,0 @@
-# Warning: This file is generated automatically, and should not be modified.
-# Instead, please modify the template in the pr-checks directory and run:
-#     (cd pr-checks; pip install ruamel.yaml@0.17.31 && python3 sync.py)
-# to regenerate this file.
-
-name: PR Check - Job run UUID added to SARIF
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  GO111MODULE: auto
-on:
-  push:
-    branches:
-      - main
-      - releases/v*
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
-  workflow_dispatch: {}
-jobs:
-  job-run-uuid-sarif:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-latest
-            version: nightly-latest
-    name: Job run UUID added to SARIF
-    permissions:
-      contents: read
-      security-events: read
-    timeout-minutes: 45
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
-      - uses: ./../action/init
-        id: init
-        with:
-          languages: javascript
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
-      - uses: ./../action/analyze
-        with:
-          output: ${{ runner.temp }}/results
-      - name: Upload SARIF
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.os }}-${{ matrix.version }}.sarif.json
-          path: ${{ runner.temp }}/results/javascript.sarif
-          retention-days: 7
-      - name: Check results
-        shell: bash
-        run: |
-          cd "$RUNNER_TEMP/results"
-          actual=$(jq -r '.runs[0].properties.jobRunUuid' javascript.sarif)
-          if [[ "$actual" != "$JOB_RUN_UUID" ]]; then
-            echo "Expected SARIF output to contain job run UUID '$JOB_RUN_UUID', but found '$actual'."
-            exit 1
-          else
-            echo "Found job run UUID '$actual'."
-          fi
-    env:
-      CODEQL_ACTION_TEST_MODE: true

.github/workflows/__language-aliases.yml

@@ -7,58 +7,63 @@ name: PR Check - Language aliases
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GO111MODULE: auto
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v2
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   language-aliases:
     strategy:
-      fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: linked
+          version: latest
     name: Language aliases
     permissions:
       contents: read
-      security-events: read
+      security-events: write
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Check out repository
+    - name: Check out repository
-        uses: actions/checkout@v4
+      uses: actions/checkout@v4
-      - name: Prepare test
+    - name: Prepare test
-        id: prepare-test
+      id: prepare-test
-        uses: ./.github/actions/prepare-test
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          version: ${{ matrix.version }}
+        version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
+        use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
+    - name: Set environment variable for Swift enablement
-      - uses: ./../action/init
+      if: >-
-        with:
+        runner.os != 'Windows' && (
-          languages: C#,java-kotlin,swift,typescript
+            matrix.version == '20220908' ||
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+            matrix.version == '20221211'
+        )
+      shell: bash
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
+    - uses: ./../action/init
+      with:
+        languages: C#,java-kotlin,swift,typescript
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
 
-      - name: Check languages
+    - name: Check languages
-        run: |
+      run: |
-          expected_languages="csharp,java,swift,javascript"
+        expected_languages="csharp,java,swift,javascript"
-          actual_languages=$(jq -r '.languages | join(",")' "$RUNNER_TEMP"/config)
+        actual_languages=$(jq -r '.languages | join(",")' "$RUNNER_TEMP"/config)
 
-          if [ "$expected_languages" != "$actual_languages" ]; then
+        if [ "$expected_languages" != "$actual_languages" ]; then
-            echo "Resolved languages did not match expected list. " \
+          echo "Resolved languages did not match expected list. " \
-              "Expected languages: $expected_languages. Actual languages: $actual_languages."
+            "Expected languages: $expected_languages. Actual languages: $actual_languages."
-            exit 1
+          exit 1
-          fi
+        fi
     env:
       CODEQL_ACTION_TEST_MODE: true

.github/workflows/__multi-language-autodetect.yml

@@ -7,147 +7,147 @@ name: PR Check - Multi-language repository
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GO111MODULE: auto
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v2
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   multi-language-autodetect:
     strategy:
-      fail-fast: false
       matrix:
         include:
-          - os: macos-latest
+        - os: ubuntu-latest
-            version: stable-v2.15.5
+          version: stable-20220908
-          - os: ubuntu-latest
+        - os: macos-latest
-            version: stable-v2.15.5
+          version: stable-20220908
-          - os: macos-latest
+        - os: ubuntu-latest
-            version: stable-v2.16.6
+          version: stable-20221211
-          - os: ubuntu-latest
+        - os: macos-latest
-            version: stable-v2.16.6
+          version: stable-20221211
-          - os: macos-latest
+        - os: ubuntu-latest
-            version: stable-v2.17.6
+          version: stable-20230418
-          - os: ubuntu-latest
+        - os: macos-latest
-            version: stable-v2.17.6
+          version: stable-20230418
-          - os: macos-latest
+        - os: ubuntu-latest
-            version: stable-v2.18.4
+          version: stable-v2.13.5
-          - os: ubuntu-latest
+        - os: macos-latest
-            version: stable-v2.18.4
+          version: stable-v2.13.5
-          - os: macos-latest
+        - os: ubuntu-latest
-            version: stable-v2.19.4
+          version: stable-v2.14.6
-          - os: ubuntu-latest
+        - os: macos-latest
-            version: stable-v2.19.4
+          version: stable-v2.14.6
-          - os: macos-latest
+        - os: ubuntu-latest
-            version: default
+          version: default
-          - os: ubuntu-latest
+        - os: macos-latest
-            version: default
+          version: default
-          - os: macos-latest
+        - os: ubuntu-latest
-            version: linked
+          version: latest
-          - os: ubuntu-latest
+        - os: macos-latest
-            version: linked
+          version: latest
-          - os: macos-latest
+        - os: ubuntu-latest
-            version: nightly-latest
+          version: nightly-latest
-          - os: ubuntu-latest
+        - os: macos-latest
-            version: nightly-latest
+          version: nightly-latest
     name: Multi-language repository
     permissions:
       contents: read
-      security-events: read
+      security-events: write
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Check out repository
+    - name: Check out repository
-        uses: actions/checkout@v4
+      uses: actions/checkout@v4
-      - name: Prepare test
+    - name: Prepare test
-        id: prepare-test
+      id: prepare-test
-        uses: ./.github/actions/prepare-test
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          version: ${{ matrix.version }}
+        version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
+        use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
+    - name: Set environment variable for Swift enablement
-      - uses: actions/setup-go@v5
+      if: >-
-        with:
+        runner.os != 'Windows' && (
-          go-version: '>=1.21.0'
+            matrix.version == '20220908' ||
+            matrix.version == '20221211'
+        )
+      shell: bash
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
+    - uses: ./../action/init
+      id: init
+      with:
+        db-location: ${{ runner.temp }}/customDbLocation
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
 
-      - uses: ./../action/init
+    - uses: ./../action/.github/actions/setup-swift
-        id: init
+      with:
-        with:
+        codeql-path: ${{ steps.init.outputs.codeql-path }}
-          db-location: ${{ runner.temp }}/customDbLocation
-          languages: ${{ runner.os == 'Linux' && 'cpp,csharp,go,java,javascript,python,ruby'
-            || '' }}
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
 
-      - uses: ./../action/.github/actions/setup-swift
+    - name: Build code
-        if: runner.os == 'macOS'
+      shell: bash
-        with:
+      run: ./build.sh
-          codeql-path: ${{ steps.init.outputs.codeql-path }}
 
-      - name: Build code
+    - uses: ./../action/analyze
-        shell: bash
+      id: analysis
-        run: ./build.sh
+      with:
+        upload-database: false
 
-      - uses: ./../action/analyze
+    - name: Check language autodetect for all languages excluding Swift
-        id: analysis
+      shell: bash
-        with:
+      run: |
-          upload-database: false
+        CPP_DB=${{ fromJson(steps.analysis.outputs.db-locations).cpp }}
+        if [[ ! -d $CPP_DB ]] || [[ ! $CPP_DB == ${{ runner.temp }}/customDbLocation/* ]]; then
+          echo "Did not create a database for CPP, or created it in the wrong location."
+          exit 1
+        fi
+        CSHARP_DB=${{ fromJson(steps.analysis.outputs.db-locations).csharp }}
+        if [[ ! -d $CSHARP_DB ]] || [[ ! $CSHARP_DB == ${{ runner.temp }}/customDbLocation/* ]]; then
+          echo "Did not create a database for C Sharp, or created it in the wrong location."
+          exit 1
+        fi
+        GO_DB=${{ fromJson(steps.analysis.outputs.db-locations).go }}
+        if [[ ! -d $GO_DB ]] || [[ ! $GO_DB == ${{ runner.temp }}/customDbLocation/* ]]; then
+          echo "Did not create a database for Go, or created it in the wrong location."
+          exit 1
+        fi
+        JAVA_DB=${{ fromJson(steps.analysis.outputs.db-locations).java }}
+        if [[ ! -d $JAVA_DB ]] || [[ ! $JAVA_DB == ${{ runner.temp }}/customDbLocation/* ]]; then
+          echo "Did not create a database for Java, or created it in the wrong location."
+          exit 1
+        fi
+        JAVASCRIPT_DB=${{ fromJson(steps.analysis.outputs.db-locations).javascript }}
+        if [[ ! -d $JAVASCRIPT_DB ]] || [[ ! $JAVASCRIPT_DB == ${{ runner.temp }}/customDbLocation/* ]]; then
+          echo "Did not create a database for Javascript, or created it in the wrong location."
+          exit 1
+        fi
+        PYTHON_DB=${{ fromJson(steps.analysis.outputs.db-locations).python }}
+        if [[ ! -d $PYTHON_DB ]] || [[ ! $PYTHON_DB == ${{ runner.temp }}/customDbLocation/* ]]; then
+          echo "Did not create a database for Python, or created it in the wrong location."
+          exit 1
+        fi
+        RUBY_DB=${{ fromJson(steps.analysis.outputs.db-locations).ruby }}
+        if [[ ! -d $RUBY_DB ]] || [[ ! $RUBY_DB == ${{ runner.temp }}/customDbLocation/* ]]; then
+          echo "Did not create a database for Ruby, or created it in the wrong location."
+          exit 1
+        fi
 
-      - name: Check language autodetect for all languages excluding Swift
+    - name: Check language autodetect for Swift
-        shell: bash
+      if: >-
-        run: |
+        env.CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT == 'true' || 
-          CPP_DB=${{ fromJson(steps.analysis.outputs.db-locations).cpp }}
+            (runner.os != 'Windows' && matrix.version == 'nightly-latest')
-          if [[ ! -d $CPP_DB ]] || [[ ! $CPP_DB == ${{ runner.temp }}/customDbLocation/* ]]; then
+      shell: bash
-            echo "Did not create a database for CPP, or created it in the wrong location."
+      run: |
-            exit 1
+        SWIFT_DB=${{ fromJson(steps.analysis.outputs.db-locations).swift }}
-          fi
+        if [[ ! -d $SWIFT_DB ]] || [[ ! $SWIFT_DB == ${{ runner.temp }}/customDbLocation/* ]]; then
-          CSHARP_DB=${{ fromJson(steps.analysis.outputs.db-locations).csharp }}
+          echo "Did not create a database for Swift, or created it in the wrong location."
-          if [[ ! -d $CSHARP_DB ]] || [[ ! $CSHARP_DB == ${{ runner.temp }}/customDbLocation/* ]]; then
+          exit 1
-            echo "Did not create a database for C Sharp, or created it in the wrong location."
+        fi
-            exit 1
-          fi
-          GO_DB=${{ fromJson(steps.analysis.outputs.db-locations).go }}
-          if [[ ! -d $GO_DB ]] || [[ ! $GO_DB == ${{ runner.temp }}/customDbLocation/* ]]; then
-            echo "Did not create a database for Go, or created it in the wrong location."
-            exit 1
-          fi
-          JAVA_DB=${{ fromJson(steps.analysis.outputs.db-locations).java }}
-          if [[ ! -d $JAVA_DB ]] || [[ ! $JAVA_DB == ${{ runner.temp }}/customDbLocation/* ]]; then
-            echo "Did not create a database for Java, or created it in the wrong location."
-            exit 1
-          fi
-          JAVASCRIPT_DB=${{ fromJson(steps.analysis.outputs.db-locations).javascript }}
-          if [[ ! -d $JAVASCRIPT_DB ]] || [[ ! $JAVASCRIPT_DB == ${{ runner.temp }}/customDbLocation/* ]]; then
-            echo "Did not create a database for Javascript, or created it in the wrong location."
-            exit 1
-          fi
-          PYTHON_DB=${{ fromJson(steps.analysis.outputs.db-locations).python }}
-          if [[ ! -d $PYTHON_DB ]] || [[ ! $PYTHON_DB == ${{ runner.temp }}/customDbLocation/* ]]; then
-            echo "Did not create a database for Python, or created it in the wrong location."
-            exit 1
-          fi
-          RUBY_DB=${{ fromJson(steps.analysis.outputs.db-locations).ruby }}
-          if [[ ! -d $RUBY_DB ]] || [[ ! $RUBY_DB == ${{ runner.temp }}/customDbLocation/* ]]; then
-            echo "Did not create a database for Ruby, or created it in the wrong location."
-            exit 1
-          fi
-
-      - name: Check language autodetect for Swift on macOS
-        if: runner.os == 'macOS'
-        shell: bash
-        run: |
-          SWIFT_DB=${{ fromJson(steps.analysis.outputs.db-locations).swift }}
-          if [[ ! -d $SWIFT_DB ]] || [[ ! $SWIFT_DB == ${{ runner.temp }}/customDbLocation/* ]]; then
-            echo "Did not create a database for Swift, or created it in the wrong location."
-            exit 1
-          fi
     env:
       CODEQL_ACTION_TEST_MODE: true

.github/workflows/__packaging-codescanning-config-inputs-js.yml

@@ -7,95 +7,102 @@ name: 'PR Check - Packaging: Config and input passed to the CLI'
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GO111MODULE: auto
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v2
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   packaging-codescanning-config-inputs-js:
     strategy:
-      fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: linked
+          version: latest
-          - os: macos-latest
+        - os: macos-latest
-            version: linked
+          version: latest
-          - os: windows-latest
+        - os: windows-latest
-            version: linked
+          version: latest
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: default
+          version: default
-          - os: macos-latest
+        - os: macos-latest
-            version: default
+          version: default
-          - os: windows-latest
+        - os: windows-latest
-            version: default
+          version: default
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: nightly-latest
+          version: nightly-latest
-          - os: macos-latest
+        - os: macos-latest
-            version: nightly-latest
+          version: nightly-latest
-          - os: windows-latest
+        - os: windows-latest
-            version: nightly-latest
+          version: nightly-latest
     name: 'Packaging: Config and input passed to the CLI'
     permissions:
       contents: read
-      security-events: read
+      security-events: write
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Check out repository
+    - name: Check out repository
-        uses: actions/checkout@v4
+      uses: actions/checkout@v4
-      - name: Prepare test
+    - name: Prepare test
-        id: prepare-test
+      id: prepare-test
-        uses: ./.github/actions/prepare-test
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          version: ${{ matrix.version }}
+        version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
+        use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
+    - name: Set environment variable for Swift enablement
-      - uses: ./../action/init
+      if: >-
-        with:
+        runner.os != 'Windows' && (
-          config-file: .github/codeql/codeql-config-packaging3.yml
+            matrix.version == '20220908' ||
-          packs: +codeql-testing/codeql-pack1@1.0.0
+            matrix.version == '20221211'
-          languages: javascript
+        )
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+      shell: bash
-      - name: Build code
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-        shell: bash
+    - uses: ./../action/init
-        run: ./build.sh
+      with:
-      - uses: ./../action/analyze
+        config-file: .github/codeql/codeql-config-packaging3.yml
-        with:
+        packs: +codeql-testing/codeql-pack1@1.0.0
-          output: ${{ runner.temp }}/results
+        languages: javascript
-          upload-database: false
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
+    - name: Build code
+      shell: bash
+      run: ./build.sh
+    - uses: ./../action/analyze
+      with:
+        output: ${{ runner.temp }}/results
+        upload-database: false
 
-      - name: Check results
+    - name: Check results
-        uses: ./../action/.github/actions/check-sarif
+      uses: ./../action/.github/actions/check-sarif
-        with:
+      with:
-          sarif-file: ${{ runner.temp }}/results/javascript.sarif
+        sarif-file: ${{ runner.temp }}/results/javascript.sarif
-          queries-run:
+        queries-run: 
-            javascript/example/empty-or-one-block,javascript/example/empty-or-one-block,javascript/example/other-query-block,javascript/example/two-block
+          javascript/example/empty-or-one-block,javascript/example/empty-or-one-block,javascript/example/other-query-block,javascript/example/two-block
-          queries-not-run: foo,bar
+        queries-not-run: foo,bar
 
-      - name: Assert Results
+    - name: Assert Results
-        shell: bash
+      shell: bash
-        run: |
+      run: |
-          cd "$RUNNER_TEMP/results"
+        cd "$RUNNER_TEMP/results"
-          # We should have 4 hits from these rules
+        # We should have 4 hits from these rules
-          EXPECTED_RULES="javascript/example/empty-or-one-block javascript/example/empty-or-one-block javascript/example/other-query-block javascript/example/two-block"
+        EXPECTED_RULES="javascript/example/empty-or-one-block javascript/example/empty-or-one-block javascript/example/other-query-block javascript/example/two-block"
 
-          # use tr to replace newlines with spaces and xargs to trim leading and trailing whitespace
+        # use tr to replace newlines with spaces and xargs to trim leading and trailing whitespace
-          RULES="$(cat javascript.sarif | jq -r '.runs[0].results[].ruleId' | sort | tr "\n\r" " " | xargs)"
+        RULES="$(cat javascript.sarif | jq -r '.runs[0].results[].ruleId' | sort | tr "\n\r" " " | xargs)"
-          echo "Found matching rules '$RULES'"
+        echo "Found matching rules '$RULES'"
-          if [ "$RULES" != "$EXPECTED_RULES" ]; then
+        if [ "$RULES" != "$EXPECTED_RULES" ]; then
-            echo "Did not match expected rules '$EXPECTED_RULES'."
+          echo "Did not match expected rules '$EXPECTED_RULES'."
-            exit 1
+          exit 1
-          fi
+        fi
     env:
+      CODEQL_PASS_CONFIG_TO_CLI: true
+
       CODEQL_ACTION_TEST_MODE: true

.github/workflows/__packaging-config-inputs-js.yml

@@ -7,95 +7,100 @@ name: 'PR Check - Packaging: Config and input'
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GO111MODULE: auto
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v2
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   packaging-config-inputs-js:
     strategy:
-      fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: linked
+          version: latest
-          - os: macos-latest
+        - os: macos-latest
-            version: linked
+          version: latest
-          - os: windows-latest
+        - os: windows-latest
-            version: linked
+          version: latest
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: default
+          version: default
-          - os: macos-latest
+        - os: macos-latest
-            version: default
+          version: default
-          - os: windows-latest
+        - os: windows-latest
-            version: default
+          version: default
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: nightly-latest
+          version: nightly-latest
-          - os: macos-latest
+        - os: macos-latest
-            version: nightly-latest
+          version: nightly-latest
-          - os: windows-latest
+        - os: windows-latest
-            version: nightly-latest
+          version: nightly-latest
     name: 'Packaging: Config and input'
     permissions:
       contents: read
-      security-events: read
+      security-events: write
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Check out repository
+    - name: Check out repository
-        uses: actions/checkout@v4
+      uses: actions/checkout@v4
-      - name: Prepare test
+    - name: Prepare test
-        id: prepare-test
+      id: prepare-test
-        uses: ./.github/actions/prepare-test
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          version: ${{ matrix.version }}
+        version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
+        use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
+    - name: Set environment variable for Swift enablement
-      - uses: ./../action/init
+      if: >-
-        with:
+        runner.os != 'Windows' && (
-          config-file: .github/codeql/codeql-config-packaging3.yml
+            matrix.version == '20220908' ||
-          packs: +codeql-testing/codeql-pack1@1.0.0
+            matrix.version == '20221211'
-          languages: javascript
+        )
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+      shell: bash
-      - name: Build code
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-        shell: bash
+    - uses: ./../action/init
-        run: ./build.sh
+      with:
-      - uses: ./../action/analyze
+        config-file: .github/codeql/codeql-config-packaging3.yml
-        with:
+        packs: +codeql-testing/codeql-pack1@1.0.0
-          output: ${{ runner.temp }}/results
+        languages: javascript
-          upload-database: false
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
+    - name: Build code
+      shell: bash
+      run: ./build.sh
+    - uses: ./../action/analyze
+      with:
+        output: ${{ runner.temp }}/results
+        upload-database: false
 
-      - name: Check results
+    - name: Check results
-        uses: ./../action/.github/actions/check-sarif
+      uses: ./../action/.github/actions/check-sarif
-        with:
+      with:
-          sarif-file: ${{ runner.temp }}/results/javascript.sarif
+        sarif-file: ${{ runner.temp }}/results/javascript.sarif
-          queries-run:
+        queries-run: 
-            javascript/example/empty-or-one-block,javascript/example/empty-or-one-block,javascript/example/other-query-block,javascript/example/two-block
+          javascript/example/empty-or-one-block,javascript/example/empty-or-one-block,javascript/example/other-query-block,javascript/example/two-block
-          queries-not-run: foo,bar
+        queries-not-run: foo,bar
 
-      - name: Assert Results
+    - name: Assert Results
-        shell: bash
+      shell: bash
-        run: |
+      run: |
-          cd "$RUNNER_TEMP/results"
+        cd "$RUNNER_TEMP/results"
-          # We should have 4 hits from these rules
+        # We should have 4 hits from these rules
-          EXPECTED_RULES="javascript/example/empty-or-one-block javascript/example/empty-or-one-block javascript/example/other-query-block javascript/example/two-block"
+        EXPECTED_RULES="javascript/example/empty-or-one-block javascript/example/empty-or-one-block javascript/example/other-query-block javascript/example/two-block"
 
-          # use tr to replace newlines with spaces and xargs to trim leading and trailing whitespace
+        # use tr to replace newlines with spaces and xargs to trim leading and trailing whitespace
-          RULES="$(cat javascript.sarif | jq -r '.runs[0].results[].ruleId' | sort | tr "\n\r" " " | xargs)"
+        RULES="$(cat javascript.sarif | jq -r '.runs[0].results[].ruleId' | sort | tr "\n\r" " " | xargs)"
-          echo "Found matching rules '$RULES'"
+        echo "Found matching rules '$RULES'"
-          if [ "$RULES" != "$EXPECTED_RULES" ]; then
+        if [ "$RULES" != "$EXPECTED_RULES" ]; then
-            echo "Did not match expected rules '$EXPECTED_RULES'."
+          echo "Did not match expected rules '$EXPECTED_RULES'."
-            exit 1
+          exit 1
-          fi
+        fi
     env:
       CODEQL_ACTION_TEST_MODE: true

.github/workflows/__packaging-config-js.yml

@@ -7,94 +7,99 @@ name: 'PR Check - Packaging: Config file'
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GO111MODULE: auto
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v2
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   packaging-config-js:
     strategy:
-      fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: linked
+          version: latest
-          - os: macos-latest
+        - os: macos-latest
-            version: linked
+          version: latest
-          - os: windows-latest
+        - os: windows-latest
-            version: linked
+          version: latest
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: default
+          version: default
-          - os: macos-latest
+        - os: macos-latest
-            version: default
+          version: default
-          - os: windows-latest
+        - os: windows-latest
-            version: default
+          version: default
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: nightly-latest
+          version: nightly-latest
-          - os: macos-latest
+        - os: macos-latest
-            version: nightly-latest
+          version: nightly-latest
-          - os: windows-latest
+        - os: windows-latest
-            version: nightly-latest
+          version: nightly-latest
     name: 'Packaging: Config file'
     permissions:
       contents: read
-      security-events: read
+      security-events: write
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Check out repository
+    - name: Check out repository
-        uses: actions/checkout@v4
+      uses: actions/checkout@v4
-      - name: Prepare test
+    - name: Prepare test
-        id: prepare-test
+      id: prepare-test
-        uses: ./.github/actions/prepare-test
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          version: ${{ matrix.version }}
+        version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
+        use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
+    - name: Set environment variable for Swift enablement
-      - uses: ./../action/init
+      if: >-
-        with:
+        runner.os != 'Windows' && (
-          config-file: .github/codeql/codeql-config-packaging.yml
+            matrix.version == '20220908' ||
-          languages: javascript
+            matrix.version == '20221211'
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+        )
-      - name: Build code
+      shell: bash
-        shell: bash
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-        run: ./build.sh
+    - uses: ./../action/init
-      - uses: ./../action/analyze
+      with:
-        with:
+        config-file: .github/codeql/codeql-config-packaging.yml
-          output: ${{ runner.temp }}/results
+        languages: javascript
-          upload-database: false
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
+    - name: Build code
+      shell: bash
+      run: ./build.sh
+    - uses: ./../action/analyze
+      with:
+        output: ${{ runner.temp }}/results
+        upload-database: false
 
-      - name: Check results
+    - name: Check results
-        uses: ./../action/.github/actions/check-sarif
+      uses: ./../action/.github/actions/check-sarif
-        with:
+      with:
-          sarif-file: ${{ runner.temp }}/results/javascript.sarif
+        sarif-file: ${{ runner.temp }}/results/javascript.sarif
-          queries-run:
+        queries-run: 
-            javascript/example/empty-or-one-block,javascript/example/empty-or-one-block,javascript/example/other-query-block,javascript/example/two-block
+          javascript/example/empty-or-one-block,javascript/example/empty-or-one-block,javascript/example/other-query-block,javascript/example/two-block
-          queries-not-run: foo,bar
+        queries-not-run: foo,bar
 
-      - name: Assert Results
+    - name: Assert Results
-        shell: bash
+      shell: bash
-        run: |
+      run: |
-          cd "$RUNNER_TEMP/results"
+        cd "$RUNNER_TEMP/results"
-          # We should have 4 hits from these rules
+        # We should have 4 hits from these rules
-          EXPECTED_RULES="javascript/example/empty-or-one-block javascript/example/empty-or-one-block javascript/example/other-query-block javascript/example/two-block"
+        EXPECTED_RULES="javascript/example/empty-or-one-block javascript/example/empty-or-one-block javascript/example/other-query-block javascript/example/two-block"
 
-          # use tr to replace newlines with spaces and xargs to trim leading and trailing whitespace
+        # use tr to replace newlines with spaces and xargs to trim leading and trailing whitespace
-          RULES="$(cat javascript.sarif | jq -r '.runs[0].results[].ruleId' | sort | tr "\n\r" " " | xargs)"
+        RULES="$(cat javascript.sarif | jq -r '.runs[0].results[].ruleId' | sort | tr "\n\r" " " | xargs)"
-          echo "Found matching rules '$RULES'"
+        echo "Found matching rules '$RULES'"
-          if [ "$RULES" != "$EXPECTED_RULES" ]; then
+        if [ "$RULES" != "$EXPECTED_RULES" ]; then
-            echo "Did not match expected rules '$EXPECTED_RULES'."
+          echo "Did not match expected rules '$EXPECTED_RULES'."
-            exit 1
+          exit 1
-          fi
+        fi
     env:
       CODEQL_ACTION_TEST_MODE: true

.github/workflows/__packaging-inputs-js.yml

@@ -7,94 +7,99 @@ name: 'PR Check - Packaging: Action input'
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GO111MODULE: auto
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v2
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   packaging-inputs-js:
     strategy:
-      fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: linked
+          version: latest
-          - os: macos-latest
+        - os: macos-latest
-            version: linked
+          version: latest
-          - os: windows-latest
+        - os: windows-latest
-            version: linked
+          version: latest
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: default
+          version: default
-          - os: macos-latest
+        - os: macos-latest
-            version: default
+          version: default
-          - os: windows-latest
+        - os: windows-latest
-            version: default
+          version: default
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: nightly-latest
+          version: nightly-latest
-          - os: macos-latest
+        - os: macos-latest
-            version: nightly-latest
+          version: nightly-latest
-          - os: windows-latest
+        - os: windows-latest
-            version: nightly-latest
+          version: nightly-latest
     name: 'Packaging: Action input'
     permissions:
       contents: read
-      security-events: read
+      security-events: write
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Check out repository
+    - name: Check out repository
-        uses: actions/checkout@v4
+      uses: actions/checkout@v4
-      - name: Prepare test
+    - name: Prepare test
-        id: prepare-test
+      id: prepare-test
-        uses: ./.github/actions/prepare-test
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          version: ${{ matrix.version }}
+        version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
+        use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
+    - name: Set environment variable for Swift enablement
-      - uses: ./../action/init
+      if: >-
-        with:
+        runner.os != 'Windows' && (
-          config-file: .github/codeql/codeql-config-packaging2.yml
+            matrix.version == '20220908' ||
-          languages: javascript
+            matrix.version == '20221211'
-          packs: codeql-testing/codeql-pack1@1.0.0, codeql-testing/codeql-pack2, codeql-testing/codeql-pack3:other-query.ql
+        )
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+      shell: bash
-      - name: Build code
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-        shell: bash
+    - uses: ./../action/init
-        run: ./build.sh
+      with:
-      - uses: ./../action/analyze
+        config-file: .github/codeql/codeql-config-packaging2.yml
-        with:
+        languages: javascript
-          output: ${{ runner.temp }}/results
+        packs: codeql-testing/codeql-pack1@1.0.0, codeql-testing/codeql-pack2, codeql-testing/codeql-pack3:other-query.ql
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
+    - name: Build code
+      shell: bash
+      run: ./build.sh
+    - uses: ./../action/analyze
+      with:
+        output: ${{ runner.temp }}/results
 
-      - name: Check results
+    - name: Check results
-        uses: ./../action/.github/actions/check-sarif
+      uses: ./../action/.github/actions/check-sarif
-        with:
+      with:
-          sarif-file: ${{ runner.temp }}/results/javascript.sarif
+        sarif-file: ${{ runner.temp }}/results/javascript.sarif
-          queries-run:
+        queries-run: 
-            javascript/example/empty-or-one-block,javascript/example/empty-or-one-block,javascript/example/other-query-block,javascript/example/two-block
+          javascript/example/empty-or-one-block,javascript/example/empty-or-one-block,javascript/example/other-query-block,javascript/example/two-block
-          queries-not-run: foo,bar
+        queries-not-run: foo,bar
 
-      - name: Assert Results
+    - name: Assert Results
-        shell: bash
+      shell: bash
-        run: |
+      run: |
-          cd "$RUNNER_TEMP/results"
+        cd "$RUNNER_TEMP/results"
-          # We should have 4 hits from these rules
+        # We should have 4 hits from these rules
-          EXPECTED_RULES="javascript/example/empty-or-one-block javascript/example/empty-or-one-block javascript/example/other-query-block javascript/example/two-block"
+        EXPECTED_RULES="javascript/example/empty-or-one-block javascript/example/empty-or-one-block javascript/example/other-query-block javascript/example/two-block"
 
-          # use tr to replace newlines with spaces and xargs to trim leading and trailing whitespace
+        # use tr to replace newlines with spaces and xargs to trim leading and trailing whitespace
-          RULES="$(cat javascript.sarif | jq -r '.runs[0].results[].ruleId' | sort | tr "\n\r" " " | xargs)"
+        RULES="$(cat javascript.sarif | jq -r '.runs[0].results[].ruleId' | sort | tr "\n\r" " " | xargs)"
-          echo "Found matching rules '$RULES'"
+        echo "Found matching rules '$RULES'"
-          if [ "$RULES" != "$EXPECTED_RULES" ]; then
+        if [ "$RULES" != "$EXPECTED_RULES" ]; then
-            echo "Did not match expected rules '$EXPECTED_RULES'."
+          echo "Did not match expected rules '$EXPECTED_RULES'."
-            exit 1
+          exit 1
-          fi
+        fi
     env:
       CODEQL_ACTION_TEST_MODE: true

.github/workflows/__remote-config.yml

@@ -7,55 +7,104 @@ name: PR Check - Remote config file
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GO111MODULE: auto
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v2
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   remote-config:
     strategy:
-      fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: linked
+          version: stable-20220908
-          - os: ubuntu-latest
+        - os: macos-latest
-            version: nightly-latest
+          version: stable-20220908
+        - os: windows-latest
+          version: stable-20220908
+        - os: ubuntu-latest
+          version: stable-20221211
+        - os: macos-latest
+          version: stable-20221211
+        - os: windows-latest
+          version: stable-20221211
+        - os: ubuntu-latest
+          version: stable-20230418
+        - os: macos-latest
+          version: stable-20230418
+        - os: windows-latest
+          version: stable-20230418
+        - os: ubuntu-latest
+          version: stable-v2.13.5
+        - os: macos-latest
+          version: stable-v2.13.5
+        - os: windows-latest
+          version: stable-v2.13.5
+        - os: ubuntu-latest
+          version: stable-v2.14.6
+        - os: macos-latest
+          version: stable-v2.14.6
+        - os: windows-latest
+          version: stable-v2.14.6
+        - os: ubuntu-latest
+          version: default
+        - os: macos-latest
+          version: default
+        - os: windows-latest
+          version: default
+        - os: ubuntu-latest
+          version: latest
+        - os: macos-latest
+          version: latest
+        - os: windows-latest
+          version: latest
+        - os: ubuntu-latest
+          version: nightly-latest
+        - os: macos-latest
+          version: nightly-latest
+        - os: windows-latest
+          version: nightly-latest
     name: Remote config file
     permissions:
       contents: read
-      security-events: read
+      security-events: write
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Check out repository
+    - name: Check out repository
-        uses: actions/checkout@v4
+      uses: actions/checkout@v4
-      - name: Prepare test
+    - name: Prepare test
-        id: prepare-test
+      id: prepare-test
-        uses: ./.github/actions/prepare-test
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          version: ${{ matrix.version }}
+        version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
+        use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
+    - name: Set environment variable for Swift enablement
-      - uses: ./../action/init
+      if: >-
-        with:
+        runner.os != 'Windows' && (
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+            matrix.version == '20220908' ||
-          languages: cpp,csharp,java,javascript,python
+            matrix.version == '20221211'
-          config-file: ${{ github.repository }}/tests/multi-language-repo/.github/codeql/custom-queries.yml@${{
+        )
-            github.sha }}
+      shell: bash
-      - name: Build code
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-        shell: bash
+    - uses: ./../action/init
-        run: ./build.sh
+      with:
-      - uses: ./../action/analyze
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
+        languages: cpp,csharp,java,javascript,python
+        config-file: ${{ github.repository }}/tests/multi-language-repo/.github/codeql/custom-queries.yml@${{
+          github.sha }}
+    - name: Build code
+      shell: bash
+      run: ./build.sh
+    - uses: ./../action/analyze
     env:
       CODEQL_ACTION_TEST_MODE: true

.github/workflows/__resolve-environment-action.yml

@@ -7,84 +7,97 @@ name: PR Check - Resolve environment
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GO111MODULE: auto
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v2
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   resolve-environment-action:
     strategy:
-      fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: default
+          version: stable-v2.13.4
-          - os: macos-latest
+        - os: macos-latest
-            version: default
+          version: stable-v2.13.4
-          - os: windows-latest
+        - os: windows-latest
-            version: default
+          version: stable-v2.13.4
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: linked
+          version: default
-          - os: macos-latest
+        - os: macos-latest
-            version: linked
+          version: default
-          - os: windows-latest
+        - os: windows-latest
-            version: linked
+          version: default
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: nightly-latest
+          version: latest
-          - os: macos-latest
+        - os: macos-latest
-            version: nightly-latest
+          version: latest
-          - os: windows-latest
+        - os: windows-latest
-            version: nightly-latest
+          version: latest
+        - os: ubuntu-latest
+          version: nightly-latest
+        - os: macos-latest
+          version: nightly-latest
+        - os: windows-latest
+          version: nightly-latest
     name: Resolve environment
     permissions:
       contents: read
-      security-events: read
+      security-events: write
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Check out repository
+    - name: Check out repository
-        uses: actions/checkout@v4
+      uses: actions/checkout@v4
-      - name: Prepare test
+    - name: Prepare test
-        id: prepare-test
+      id: prepare-test
-        uses: ./.github/actions/prepare-test
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          version: ${{ matrix.version }}
+        version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
+        use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
+    - name: Set environment variable for Swift enablement
-      - uses: ./../action/init
+      if: >-
-        with:
+        runner.os != 'Windows' && (
-          languages: go,javascript-typescript
+            matrix.version == '20220908' ||
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+            matrix.version == '20221211'
+        )
+      shell: bash
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
+    - uses: ./../action/init
+      with:
+        languages: ${{ matrix.version == 'stable-v2.13.4' && 'go' || 'go,javascript-typescript'
+          }}
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
 
-      - name: Resolve environment for Go
+    - name: Resolve environment for Go
-        uses: ./../action/resolve-environment
+      uses: ./../action/resolve-environment
-        id: resolve-environment-go
+      id: resolve-environment-go
-        with:
+      with:
-          language: go
+        language: go
 
-      - name: Fail if Go configuration missing
+    - name: Fail if Go configuration missing
-        if: (!fromJSON(steps.resolve-environment-go.outputs.environment).configuration.go)
+      if: (!fromJSON(steps.resolve-environment-go.outputs.environment).configuration.go)
-        run: exit 1
+      run: exit 1
 
-      - name: Resolve environment for JavaScript/TypeScript
+    - name: Resolve environment for JavaScript/TypeScript
-        uses: ./../action/resolve-environment
+      if: matrix.version != 'stable-v2.13.4'
-        id: resolve-environment-js
+      uses: ./../action/resolve-environment
-        with:
+      id: resolve-environment-js
-          language: javascript-typescript
+      with:
+        language: javascript-typescript
 
-      - name: Fail if JavaScript/TypeScript configuration present
+    - name: Fail if JavaScript/TypeScript configuration present
-        if:
+      if: matrix.version != 'stable-v2.13.4' && 
-          fromJSON(steps.resolve-environment-js.outputs.environment).configuration.javascript
+        fromJSON(steps.resolve-environment-js.outputs.environment).configuration.javascript
-        run: exit 1
+      run: exit 1
     env:
       CODEQL_ACTION_TEST_MODE: true

.github/workflows/__rubocop-multi-language.yml

@@ -7,63 +7,68 @@ name: PR Check - RuboCop multi-language
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GO111MODULE: auto
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v2
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   rubocop-multi-language:
     strategy:
-      fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: default
+          version: default
     name: RuboCop multi-language
     permissions:
       contents: read
-      security-events: read
+      security-events: write
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Check out repository
+    - name: Check out repository
-        uses: actions/checkout@v4
+      uses: actions/checkout@v4
-      - name: Prepare test
+    - name: Prepare test
-        id: prepare-test
+      id: prepare-test
-        uses: ./.github/actions/prepare-test
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          version: ${{ matrix.version }}
+        version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
+        use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
+    - name: Set environment variable for Swift enablement
-      - name: Set up Ruby
+      if: >-
-        uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1.229.0
+        runner.os != 'Windows' && (
-        with:
+            matrix.version == '20220908' ||
-          ruby-version: 2.6
+            matrix.version == '20221211'
-      - name: Install Code Scanning integration
+        )
-        shell: bash
+      shell: bash
-        run: bundle add code-scanning-rubocop --version 0.3.0 --skip-install
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-      - name: Install dependencies
+    - name: Set up Ruby
-        shell: bash
+      uses: ruby/setup-ruby@v1
-        run: bundle install
+      with:
-      - name: RuboCop run
+        ruby-version: 2.6
-        shell: bash
+    - name: Install Code Scanning integration
-        run: |
+      shell: bash
-          bash -c "
+      run: bundle add code-scanning-rubocop --version 0.3.0 --skip-install
-            bundle exec rubocop --require code_scanning --format CodeScanning::SarifFormatter -o rubocop.sarif
+    - name: Install dependencies
-            [[ $? -ne 2 ]]
+      shell: bash
-          "
+      run: bundle install
-      - uses: ./../action/upload-sarif
+    - name: RuboCop run
-        with:
+      shell: bash
-          sarif_file: rubocop.sarif
+      run: |
+        bash -c "
+          bundle exec rubocop --require code_scanning --format CodeScanning::SarifFormatter -o rubocop.sarif
+          [[ $? -ne 2 ]]
+        "
+    - uses: ./../action/upload-sarif
+      with:
+        sarif_file: rubocop.sarif
     env:
       CODEQL_ACTION_TEST_MODE: true

.github/workflows/__ruby.yml

@@ -7,69 +7,74 @@ name: PR Check - Ruby analysis
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GO111MODULE: auto
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v2
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   ruby:
     strategy:
-      fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: linked
+          version: latest
-          - os: macos-latest
+        - os: macos-latest
-            version: linked
+          version: latest
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: default
+          version: default
-          - os: macos-latest
+        - os: macos-latest
-            version: default
+          version: default
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: nightly-latest
+          version: nightly-latest
-          - os: macos-latest
+        - os: macos-latest
-            version: nightly-latest
+          version: nightly-latest
     name: Ruby analysis
     permissions:
       contents: read
-      security-events: read
+      security-events: write
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Check out repository
+    - name: Check out repository
-        uses: actions/checkout@v4
+      uses: actions/checkout@v4
-      - name: Prepare test
+    - name: Prepare test
-        id: prepare-test
+      id: prepare-test
-        uses: ./.github/actions/prepare-test
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          version: ${{ matrix.version }}
+        version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
+        use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
+    - name: Set environment variable for Swift enablement
-      - uses: ./../action/init
+      if: >-
-        with:
+        runner.os != 'Windows' && (
-          languages: ruby
+            matrix.version == '20220908' ||
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+            matrix.version == '20221211'
-      - uses: ./../action/analyze
+        )
-        id: analysis
+      shell: bash
-        with:
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-          upload-database: false
+    - uses: ./../action/init
-      - name: Check database
+      with:
-        shell: bash
+        languages: ruby
-        run: |
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
-          RUBY_DB="${{ fromJson(steps.analysis.outputs.db-locations).ruby }}"
+    - uses: ./../action/analyze
-          if [[ ! -d "$RUBY_DB" ]]; then
+      id: analysis
-            echo "Did not create a database for Ruby."
+      with:
-            exit 1
+        upload-database: false
-          fi
+    - name: Check database
+      shell: bash
+      run: |
+        RUBY_DB="${{ fromJson(steps.analysis.outputs.db-locations).ruby }}"
+        if [[ ! -d "$RUBY_DB" ]]; then
+          echo "Did not create a database for Ruby."
+          exit 1
+        fi
     env:
       CODEQL_ACTION_TEST_MODE: true

.github/workflows/__rust.yml

@@ -1,71 +0,0 @@
-# Warning: This file is generated automatically, and should not be modified.
-# Instead, please modify the template in the pr-checks directory and run:
-#     (cd pr-checks; pip install ruamel.yaml@0.17.31 && python3 sync.py)
-# to regenerate this file.
-
-name: PR Check - Rust analysis
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  GO111MODULE: auto
-on:
-  push:
-    branches:
-      - main
-      - releases/v*
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
-  workflow_dispatch: {}
-jobs:
-  rust:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-latest
-            version: linked
-          - os: ubuntu-latest
-            version: default
-          - os: ubuntu-latest
-            version: nightly-latest
-    name: Rust analysis
-    permissions:
-      contents: read
-      security-events: read
-    timeout-minutes: 45
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
-      - uses: ./../action/init
-        with:
-          languages: rust
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
-        env:
-          CODEQL_ACTION_RUST_ANALYSIS: true
-      - uses: ./../action/analyze
-        id: analysis
-        with:
-          upload-database: false
-      - name: Check database
-        shell: bash
-        run: |
-          RUST_DB="${{ fromJson(steps.analysis.outputs.db-locations).rust }}"
-          if [[ ! -d "$RUST_DB" ]]; then
-            echo "Did not create a database for Rust."
-            exit 1
-          fi
-    env:
-      CODEQL_ACTION_TEST_MODE: true

.github/workflows/__scaling-reserved-ram.yml

@@ -0,0 +1,103 @@
+# Warning: This file is generated automatically, and should not be modified.
+# Instead, please modify the template in the pr-checks directory and run:
+#     (cd pr-checks; pip install ruamel.yaml@0.17.31 && python3 sync.py)
+# to regenerate this file.
+
+name: PR Check - Scaling reserved RAM
+env:
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  GO111MODULE: auto
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
+on:
+  push:
+    branches:
+    - main
+    - releases/v2
+  pull_request:
+    types:
+    - opened
+    - synchronize
+    - reopened
+    - ready_for_review
+  workflow_dispatch: {}
+jobs:
+  scaling-reserved-ram:
+    strategy:
+      matrix:
+        include:
+        - os: ubuntu-latest
+          version: stable-20220908
+        - os: macos-latest
+          version: stable-20220908
+        - os: ubuntu-latest
+          version: stable-20221211
+        - os: macos-latest
+          version: stable-20221211
+        - os: ubuntu-latest
+          version: stable-20230418
+        - os: macos-latest
+          version: stable-20230418
+        - os: ubuntu-latest
+          version: stable-v2.13.5
+        - os: macos-latest
+          version: stable-v2.13.5
+        - os: ubuntu-latest
+          version: stable-v2.14.6
+        - os: macos-latest
+          version: stable-v2.14.6
+        - os: ubuntu-latest
+          version: default
+        - os: macos-latest
+          version: default
+        - os: ubuntu-latest
+          version: latest
+        - os: macos-latest
+          version: latest
+        - os: ubuntu-latest
+          version: nightly-latest
+        - os: macos-latest
+          version: nightly-latest
+    name: Scaling reserved RAM
+    permissions:
+      contents: read
+      security-events: write
+    timeout-minutes: 45
+    runs-on: ${{ matrix.os }}
+    steps:
+    - name: Check out repository
+      uses: actions/checkout@v4
+    - name: Prepare test
+      id: prepare-test
+      uses: ./.github/actions/prepare-test
+      with:
+        version: ${{ matrix.version }}
+        use-all-platform-bundle: 'false'
+    - name: Set environment variable for Swift enablement
+      if: >-
+        runner.os != 'Windows' && (
+            matrix.version == '20220908' ||
+            matrix.version == '20221211'
+        )
+      shell: bash
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
+    - uses: ./../action/init
+      id: init
+      with:
+        db-location: ${{ runner.temp }}/customDbLocation
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
+
+    - uses: ./../action/.github/actions/setup-swift
+      with:
+        codeql-path: ${{ steps.init.outputs.codeql-path }}
+
+    - name: Build code
+      shell: bash
+      run: ./build.sh
+
+    - uses: ./../action/analyze
+      id: analysis
+      with:
+        upload-database: false
+    env:
+      CODEQL_ACTION_SCALING_RESERVED_RAM: true
+      CODEQL_ACTION_TEST_MODE: true

.github/workflows/__split-workflow.yml

@@ -7,93 +7,98 @@ name: PR Check - Split workflow
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GO111MODULE: auto
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v2
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   split-workflow:
     strategy:
-      fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: linked
+          version: latest
-          - os: macos-latest
+        - os: macos-latest
-            version: linked
+          version: latest
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: default
+          version: default
-          - os: macos-latest
+        - os: macos-latest
-            version: default
+          version: default
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: nightly-latest
+          version: nightly-latest
-          - os: macos-latest
+        - os: macos-latest
-            version: nightly-latest
+          version: nightly-latest
     name: Split workflow
     permissions:
       contents: read
-      security-events: read
+      security-events: write
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Check out repository
+    - name: Check out repository
-        uses: actions/checkout@v4
+      uses: actions/checkout@v4
-      - name: Prepare test
+    - name: Prepare test
-        id: prepare-test
+      id: prepare-test
-        uses: ./.github/actions/prepare-test
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          version: ${{ matrix.version }}
+        version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
+        use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
+    - name: Set environment variable for Swift enablement
-      - uses: ./../action/init
+      if: >-
-        with:
+        runner.os != 'Windows' && (
-          config-file: .github/codeql/codeql-config-packaging3.yml
+            matrix.version == '20220908' ||
-          packs: +codeql-testing/codeql-pack1@1.0.0
+            matrix.version == '20221211'
-          languages: javascript
+        )
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+      shell: bash
-      - name: Build code
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-        shell: bash
+    - uses: ./../action/init
-        run: ./build.sh
+      with:
-      - uses: ./../action/analyze
+        config-file: .github/codeql/codeql-config-packaging3.yml
-        with:
+        packs: +codeql-testing/codeql-pack1@1.0.0
-          skip-queries: true
+        languages: javascript
-          output: ${{ runner.temp }}/results
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
-          upload-database: false
+    - name: Build code
+      shell: bash
+      run: ./build.sh
+    - uses: ./../action/analyze
+      with:
+        skip-queries: true
+        output: ${{ runner.temp }}/results
+        upload-database: false
 
-      - name: Assert No Results
+    - name: Assert No Results
-        shell: bash
+      shell: bash
-        run: |
+      run: |
-          if [ "$(ls -A $RUNNER_TEMP/results)" ]; then
+        if [ "$(ls -A $RUNNER_TEMP/results)" ]; then
-            echo "Expected results directory to be empty after skipping query execution!"
+          echo "Expected results directory to be empty after skipping query execution!"
-            exit 1
+          exit 1
-          fi
+        fi
-      - uses: ./../action/analyze
+    - uses: ./../action/analyze
-        with:
+      with:
-          output: ${{ runner.temp }}/results
+        output: ${{ runner.temp }}/results
-          upload-database: false
+        upload-database: false
-      - name: Assert Results
+    - name: Assert Results
-        shell: bash
+      shell: bash
-        run: |
+      run: |
-          cd "$RUNNER_TEMP/results"
+        cd "$RUNNER_TEMP/results"
-          # We should have 4 hits from these rules
+        # We should have 4 hits from these rules
-          EXPECTED_RULES="javascript/example/empty-or-one-block javascript/example/empty-or-one-block javascript/example/other-query-block javascript/example/two-block"
+        EXPECTED_RULES="javascript/example/empty-or-one-block javascript/example/empty-or-one-block javascript/example/other-query-block javascript/example/two-block"
 
-          # use tr to replace newlines with spaces and xargs to trim leading and trailing whitespace
+        # use tr to replace newlines with spaces and xargs to trim leading and trailing whitespace
-          RULES="$(cat javascript.sarif | jq -r '.runs[0].results[].ruleId' | sort | tr "\n\r" " " | xargs)"
+        RULES="$(cat javascript.sarif | jq -r '.runs[0].results[].ruleId' | sort | tr "\n\r" " " | xargs)"
-          echo "Found matching rules '$RULES'"
+        echo "Found matching rules '$RULES'"
-          if [ "$RULES" != "$EXPECTED_RULES" ]; then
+        if [ "$RULES" != "$EXPECTED_RULES" ]; then
-            echo "Did not match expected rules '$EXPECTED_RULES'."
+          echo "Did not match expected rules '$EXPECTED_RULES'."
-            exit 1
+          exit 1
-          fi
+        fi
     env:
       CODEQL_ACTION_TEST_MODE: true

.github/workflows/__start-proxy.yml

@@ -1,75 +0,0 @@
-# Warning: This file is generated automatically, and should not be modified.
-# Instead, please modify the template in the pr-checks directory and run:
-#     (cd pr-checks; pip install ruamel.yaml@0.17.31 && python3 sync.py)
-# to regenerate this file.
-
-name: PR Check - Start proxy
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  GO111MODULE: auto
-on:
-  push:
-    branches:
-      - main
-      - releases/v*
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
-  workflow_dispatch: {}
-jobs:
-  start-proxy:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-latest
-            version: linked
-          - os: macos-latest
-            version: linked
-          - os: windows-latest
-            version: linked
-    name: Start proxy
-    permissions:
-      contents: read
-      security-events: read
-    timeout-minutes: 45
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
-      - uses: ./../action/init
-        with:
-          languages: csharp
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
-
-      - name: Setup proxy for registries
-        id: proxy
-        uses: ./../action/start-proxy
-        with:
-          registry_secrets: '[{ "type": "nuget_feed", "url": "https://api.nuget.org/v3/index.json"
-            }]'
-
-      - name: Print proxy outputs
-        run: |
-          echo "${{ steps.proxy.outputs.proxy_host }}"
-          echo "${{ steps.proxy.outputs.proxy_port }}"
-          echo "${{ steps.proxy.outputs.proxy_urls }}"
-
-      - name: Fail if proxy outputs are not set
-        if: (!steps.proxy.outputs.proxy_host) || (!steps.proxy.outputs.proxy_port)
-          || (!steps.proxy.outputs.proxy_ca_certificate) || (!steps.proxy.outputs.proxy_urls)
-        run: exit 1
-    env:
-      CODEQL_ACTION_TEST_MODE: true

.github/workflows/__submit-sarif-failure.yml

@@ -7,67 +7,70 @@ name: PR Check - Submit SARIF after failure
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GO111MODULE: auto
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v2
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   submit-sarif-failure:
     strategy:
-      fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: linked
+          version: latest
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: default
+          version: default
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: nightly-latest
+          version: nightly-latest
     name: Submit SARIF after failure
     permissions:
       contents: read
-      security-events: write # needed to upload the SARIF file
+      security-events: write
-
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Check out repository
+    - name: Check out repository
-        uses: actions/checkout@v4
+      uses: actions/checkout@v4
-      - name: Prepare test
+    - name: Prepare test
-        id: prepare-test
+      id: prepare-test
-        uses: ./.github/actions/prepare-test
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          version: ${{ matrix.version }}
+        version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
+        use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
+    - name: Set environment variable for Swift enablement
-      - uses: actions/checkout@v4
+      if: >-
-      - uses: ./init
+        runner.os != 'Windows' && (
-        with:
+            matrix.version == '20220908' ||
-          languages: javascript
+            matrix.version == '20221211'
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+        )
-      - name: Fail
+      shell: bash
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
+    - uses: actions/checkout@v4
+    - uses: ./init
+      with:
+        languages: javascript
+    - name: Fail
     # We want this job to pass if the Action correctly uploads the SARIF file for
     # the failed run.
     # Setting this step to continue on error means that it is marked as completing
     # successfully, so will not fail the job.
-        continue-on-error: true
+      continue-on-error: true
-        run: exit 1
+      run: exit 1
-      - uses: ./analyze
+    - uses: ./analyze
     # In a real workflow, this step wouldn't run. Since we used `continue-on-error`
     # above, we manually disable it with an `if` condition.
-        if: false
+      if: false
-        with:
+      with:
-          category: /test-codeql-version:${{ matrix.version }}
+        category: /test-codeql-version:${{ matrix.version }}
     env:
   # Internal-only environment variable used to indicate that the post-init Action
   # should expect to upload a SARIF file for the failed run.

.github/workflows/__swift-autobuild.yml

@@ -1,75 +0,0 @@
-# Warning: This file is generated automatically, and should not be modified.
-# Instead, please modify the template in the pr-checks directory and run:
-#     (cd pr-checks; pip install ruamel.yaml@0.17.31 && python3 sync.py)
-# to regenerate this file.
-
-name: PR Check - Swift analysis using autobuild
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  GO111MODULE: auto
-on:
-  push:
-    branches:
-      - main
-      - releases/v*
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
-  workflow_dispatch: {}
-jobs:
-  swift-autobuild:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: macos-latest
-            version: nightly-latest
-    name: Swift analysis using autobuild
-    permissions:
-      contents: read
-      security-events: read
-    timeout-minutes: 45
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
-      - uses: ./../action/init
-        id: init
-        with:
-          languages: swift
-          build-mode: autobuild
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
-      - uses: ./../action/.github/actions/setup-swift
-        with:
-          codeql-path: ${{steps.init.outputs.codeql-path}}
-      - name: Check working directory
-        shell: bash
-        run: pwd
-      - uses: ./../action/autobuild
-        timeout-minutes: 30
-      - uses: ./../action/analyze
-        id: analysis
-        with:
-          upload-database: false
-      - name: Check database
-        shell: bash
-        run: |
-          SWIFT_DB="${{ fromJson(steps.analysis.outputs.db-locations).swift }}"
-          if [[ ! -d "$SWIFT_DB" ]]; then
-            echo "Did not create a database for Swift."
-            exit 1
-          fi
-    env:
-      CODEQL_ACTION_TEST_MODE: true

.github/workflows/__swift-custom-build.yml

@@ -7,74 +7,85 @@ name: PR Check - Swift analysis using a custom build command
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GO111MODULE: auto
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v2
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   swift-custom-build:
     strategy:
-      fail-fast: false
       matrix:
         include:
-          - os: macos-latest
+        - os: ubuntu-latest
-            version: linked
+          version: latest
-          - os: macos-latest
+        - os: macos-latest
-            version: default
+          version: latest
-          - os: macos-latest
+        - os: ubuntu-latest
-            version: nightly-latest
+          version: default
+        - os: macos-latest
+          version: default
+        - os: ubuntu-latest
+          version: nightly-latest
+        - os: macos-latest
+          version: nightly-latest
     name: Swift analysis using a custom build command
     permissions:
       contents: read
-      security-events: read
+      security-events: write
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Check out repository
+    - name: Check out repository
-        uses: actions/checkout@v4
+      uses: actions/checkout@v4
-      - name: Prepare test
+    - name: Prepare test
-        id: prepare-test
+      id: prepare-test
-        uses: ./.github/actions/prepare-test
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          version: ${{ matrix.version }}
+        version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
+        use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
+    - name: Set environment variable for Swift enablement
-      - uses: ./../action/init
+      if: >-
-        id: init
+        runner.os != 'Windows' && (
-        with:
+            matrix.version == '20220908' ||
-          languages: swift
+            matrix.version == '20221211'
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+        )
-      - uses: ./../action/.github/actions/setup-swift
+      shell: bash
-        with:
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-          codeql-path: ${{steps.init.outputs.codeql-path}}
+    - uses: ./../action/init
-      - name: Check working directory
+      id: init
-        shell: bash
+      with:
-        run: pwd
+        languages: swift
-      - name: Build code
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
-        shell: bash
+    - uses: ./../action/.github/actions/setup-swift
-        run: ./build.sh
+      with:
-      - uses: ./../action/analyze
+        codeql-path: ${{steps.init.outputs.codeql-path}}
-        id: analysis
+    - name: Check working directory
-        with:
+      shell: bash
-          upload-database: false
+      run: pwd
-      - name: Check database
+    - name: Build code
-        shell: bash
+      shell: bash
-        run: |
+      run: ./build.sh
-          SWIFT_DB="${{ fromJson(steps.analysis.outputs.db-locations).swift }}"
+    - uses: ./../action/analyze
-          if [[ ! -d "$SWIFT_DB" ]]; then
+      id: analysis
-            echo "Did not create a database for Swift."
+      with:
-            exit 1
+        upload-database: false
-          fi
+    - name: Check database
+      shell: bash
+      run: |
+        SWIFT_DB="${{ fromJson(steps.analysis.outputs.db-locations).swift }}"
+        if [[ ! -d "$SWIFT_DB" ]]; then
+          echo "Did not create a database for Swift."
+          exit 1
+        fi
     env:
       DOTNET_GENERATE_ASPNET_CERTIFICATE: 'false'
       CODEQL_ACTION_TEST_MODE: true

.github/workflows/__test-autobuild-working-dir.yml

@@ -7,66 +7,73 @@ name: PR Check - Autobuild working directory
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GO111MODULE: auto
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v2
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   test-autobuild-working-dir:
     strategy:
-      fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: linked
+          version: latest
     name: Autobuild working directory
     permissions:
       contents: read
-      security-events: read
+      security-events: write
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Check out repository
+    - name: Check out repository
-        uses: actions/checkout@v4
+      uses: actions/checkout@v4
-      - name: Prepare test
+    - name: Prepare test
-        id: prepare-test
+      id: prepare-test
-        uses: ./.github/actions/prepare-test
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          version: ${{ matrix.version }}
+        version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
+        use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
+    - name: Set environment variable for Swift enablement
-      - name: Test setup
+      if: >-
-        shell: bash
+        runner.os != 'Windows' && (
-        run: |
+            matrix.version == '20220908' ||
-          # Make sure that Gradle build succeeds in autobuild-dir ...
+            matrix.version == '20221211'
-          cp -a ../action/tests/java-repo autobuild-dir
+        )
-          # ... and fails if attempted in the current directory
+      shell: bash
-          echo > build.gradle
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-      - uses: ./../action/init
+    - name: Test setup
-        with:
+      shell: bash
-          languages: java
+      run: |
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+        # Make sure that Gradle build succeeds in autobuild-dir ...
-      - uses: ./../action/autobuild
+        cp -a ../action/tests/java-repo autobuild-dir
-        with:
+        # ... and fails if attempted in the current directory
-          working-directory: autobuild-dir
+        echo > build.gradle
-      - uses: ./../action/analyze
+    - uses: ./../action/init
-      - name: Check database
+      with:
-        shell: bash
+        languages: java
-        run: |
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
-          cd "$RUNNER_TEMP/codeql_databases"
+    - uses: ./../action/autobuild
-          if [[ ! -d java ]]; then
+      with:
-            echo "Did not find a Java database"
+        working-directory: autobuild-dir
-            exit 1
+    - uses: ./../action/analyze
-          fi
+      with:
+        upload-database: false
+    - name: Check database
+      shell: bash
+      run: |
+        cd "$RUNNER_TEMP/codeql_databases"
+        if [[ ! -d java ]]; then
+          echo "Did not find a Java database"
+          exit 1
+        fi
     env:
       CODEQL_ACTION_TEST_MODE: true

.github/workflows/__test-local-codeql.yml

@@ -7,59 +7,67 @@ name: PR Check - Local CodeQL bundle
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GO111MODULE: auto
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v2
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   test-local-codeql:
     strategy:
-      fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: nightly-latest
+          version: nightly-latest
     name: Local CodeQL bundle
     permissions:
       contents: read
-      security-events: read
+      security-events: write
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Check out repository
+    - name: Check out repository
-        uses: actions/checkout@v4
+      uses: actions/checkout@v4
-      - name: Prepare test
+    - name: Prepare test
-        id: prepare-test
+      id: prepare-test
-        uses: ./.github/actions/prepare-test
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          version: ${{ matrix.version }}
+        version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
+        use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
+    - name: Set environment variable for Swift enablement
-      - name: Fetch a CodeQL bundle
+      if: >-
-        shell: bash
+        runner.os != 'Windows' && (
-        env:
+            matrix.version == '20220908' ||
-          CODEQL_URL: ${{ steps.prepare-test.outputs.tools-url }}
+            matrix.version == '20221211'
-        run: |
+        )
-          wget "$CODEQL_URL"
+      shell: bash
-      - id: init
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-        uses: ./../action/init
+    - name: Fetch a CodeQL bundle
-        with:
+      shell: bash
-      # Swift is not supported on Ubuntu so we manually exclude it from the list here
+      env:
-          languages: cpp,csharp,go,java,javascript,python,ruby
+        CODEQL_URL: ${{ steps.prepare-test.outputs.tools-url }}
-          tools: ./codeql-bundle-linux64.tar.zst
+      run: |
-      - name: Build code
+        wget "$CODEQL_URL"
-        shell: bash
+    - id: init
-        run: ./build.sh
+      uses: ./../action/init
-      - uses: ./../action/analyze
+      with:
+        tools: ./codeql-bundle-linux64.tar.gz
+    - uses: ./../action/.github/actions/setup-swift
+      with:
+        codeql-path: ${{ steps.init.outputs.codeql-path }}
+    - name: Build code
+      shell: bash
+      run: ./build.sh
+    - uses: ./../action/analyze
+      with:
+        upload-database: false
     env:
       CODEQL_ACTION_TEST_MODE: true

.github/workflows/__test-proxy.yml

@@ -7,70 +7,64 @@ name: PR Check - Proxy test
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GO111MODULE: auto
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v2
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   test-proxy:
     strategy:
-      fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: linked
+          version: latest
-          - os: ubuntu-latest
-            version: nightly-latest
     name: Proxy test
     permissions:
       contents: read
-      security-events: read
+      security-events: write
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-  # These steps are required to initialise the `gh` cli in a container that doesn't
+    - name: Check out repository
-  # come pre-installed with it. The reason for that is that this is later
+      uses: actions/checkout@v4
-  # needed by the `prepare-test` workflow to find the latest release of CodeQL.
+    - name: Prepare test
-      - name: Set up GitHub CLI
+      id: prepare-test
-        run: |
+      uses: ./.github/actions/prepare-test
-          apt update
+      with:
-          apt install -y curl libreadline8 gnupg2 software-properties-common zstd
+        version: ${{ matrix.version }}
-          curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
+        use-all-platform-bundle: 'false'
-          apt-key add /usr/share/keyrings/githubcli-archive-keyring.gpg
+    - name: Set environment variable for Swift enablement
-          apt-add-repository https://cli.github.com/packages
+      if: >-
-          apt install -y gh
+        runner.os != 'Windows' && (
-        env: {}
+            matrix.version == '20220908' ||
-      - name: Check out repository
+            matrix.version == '20221211'
-        uses: actions/checkout@v4
+        )
-      - name: Prepare test
+      shell: bash
-        id: prepare-test
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-        uses: ./.github/actions/prepare-test
+    - uses: ./../action/init
-        with:
+      with:
-          version: ${{ matrix.version }}
+        languages: javascript
-          use-all-platform-bundle: 'false'
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
-          setup-kotlin: 'false'
+    - uses: ./../action/analyze
-      - uses: ./../action/init
+      with:
-        with:
+        upload-database: false
-          languages: javascript
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
-      - uses: ./../action/analyze
     env:
       https_proxy: http://squid-proxy:3128
       CODEQL_ACTION_TEST_MODE: true
     container:
       image: ubuntu:22.04
+      options: --dns 127.0.0.1
     services:
       squid-proxy:
         image: ubuntu/squid:latest
         ports:
-          - 3128:3128
+        - 3128:3128

.github/workflows/__unset-environment.yml

@@ -7,100 +7,118 @@ name: PR Check - Test unsetting environment variables
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GO111MODULE: auto
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v2
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   unset-environment:
     strategy:
-      fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: linked
+          version: stable-20220908
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: nightly-latest
+          version: stable-20221211
+        - os: ubuntu-latest
+          version: stable-20230418
+        - os: ubuntu-latest
+          version: stable-v2.13.5
+        - os: ubuntu-latest
+          version: stable-v2.14.6
+        - os: ubuntu-latest
+          version: default
+        - os: ubuntu-latest
+          version: latest
+        - os: ubuntu-latest
+          version: nightly-latest
     name: Test unsetting environment variables
     permissions:
       contents: read
-      security-events: read
+      security-events: write
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Check out repository
+    - name: Check out repository
-        uses: actions/checkout@v4
+      uses: actions/checkout@v4
-      - name: Prepare test
+    - name: Prepare test
-        id: prepare-test
+      id: prepare-test
-        uses: ./.github/actions/prepare-test
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          version: ${{ matrix.version }}
+        version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
+        use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
+    - name: Set environment variable for Swift enablement
-      - uses: ./../action/init
+      if: >-
-        id: init
+        runner.os != 'Windows' && (
-        with:
+            matrix.version == '20220908' ||
-          db-location: ${{ runner.temp }}/customDbLocation
+            matrix.version == '20221211'
-      # Swift is not supported on Ubuntu so we manually exclude it from the list here
+        )
-          languages: cpp,csharp,go,java,javascript,python,ruby
+      shell: bash
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-      - uses: actions/setup-go@v5
+    - uses: ./../action/init
-        with:
+      id: init
-          go-version: '>=1.21.0'
+      with:
-      - name: Build code
+        db-location: ${{ runner.temp }}/customDbLocation
-        shell: bash
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
-        run: env -i PATH="$PATH" HOME="$HOME" ./build.sh
+    - uses: ./../action/.github/actions/setup-swift
-      - uses: ./../action/analyze
+      with:
-        id: analysis
+        codeql-path: ${{ steps.init.outputs.codeql-path }}
-        with:
+    - name: Build code
-          upload-database: false
+      shell: bash
-      - shell: bash
+    # Disable Kotlin analysis while it's incompatible with Kotlin 1.8, until we find a
-        run: |
+    # workaround for our PR checks.
-          CPP_DB="${{ fromJson(steps.analysis.outputs.db-locations).cpp }}"
+      run: env -i CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN=true PATH="$PATH" HOME="$HOME"
-          if [[ ! -d "$CPP_DB" ]] || [[ ! "$CPP_DB" == "${RUNNER_TEMP}/customDbLocation/cpp" ]]; then
+        ./build.sh
-            echo "::error::Did not create a database for CPP, or created it in the wrong location." \
+    - uses: ./../action/analyze
-              "Expected location was '${RUNNER_TEMP}/customDbLocation/cpp' but actual was '${CPP_DB}'"
+      id: analysis
-            exit 1
+      with:
-          fi
+        upload-database: false
-          CSHARP_DB="${{ fromJson(steps.analysis.outputs.db-locations).csharp }}"
+    - shell: bash
-          if [[ ! -d "$CSHARP_DB" ]] || [[ ! "$CSHARP_DB" == "${RUNNER_TEMP}/customDbLocation/csharp" ]]; then
+      run: |
-            echo "::error::Did not create a database for C Sharp, or created it in the wrong location." \
+        CPP_DB="${{ fromJson(steps.analysis.outputs.db-locations).cpp }}"
-              "Expected location was '${RUNNER_TEMP}/customDbLocation/csharp' but actual was '${CSHARP_DB}'"
+        if [[ ! -d "$CPP_DB" ]] || [[ ! "$CPP_DB" == "${RUNNER_TEMP}/customDbLocation/cpp" ]]; then
-            exit 1
+          echo "::error::Did not create a database for CPP, or created it in the wrong location." \
-          fi
+            "Expected location was '${RUNNER_TEMP}/customDbLocation/cpp' but actual was '${CPP_DB}'"
-          GO_DB="${{ fromJson(steps.analysis.outputs.db-locations).go }}"
+          exit 1
-          if [[ ! -d "$GO_DB" ]] || [[ ! "$GO_DB" == "${RUNNER_TEMP}/customDbLocation/go" ]]; then
+        fi
-            echo "::error::Did not create a database for Go, or created it in the wrong location." \
+        CSHARP_DB="${{ fromJson(steps.analysis.outputs.db-locations).csharp }}"
-              "Expected location was '${RUNNER_TEMP}/customDbLocation/go' but actual was '${GO_DB}'"
+        if [[ ! -d "$CSHARP_DB" ]] || [[ ! "$CSHARP_DB" == "${RUNNER_TEMP}/customDbLocation/csharp" ]]; then
-            exit 1
+          echo "::error::Did not create a database for C Sharp, or created it in the wrong location." \
-          fi
+            "Expected location was '${RUNNER_TEMP}/customDbLocation/csharp' but actual was '${CSHARP_DB}'"
-          JAVA_DB="${{ fromJson(steps.analysis.outputs.db-locations).java }}"
+          exit 1
-          if [[ ! -d "$JAVA_DB" ]] || [[ ! "$JAVA_DB" == "${RUNNER_TEMP}/customDbLocation/java" ]]; then
+        fi
-            echo "::error::Did not create a database for Java, or created it in the wrong location." \
+        GO_DB="${{ fromJson(steps.analysis.outputs.db-locations).go }}"
-              "Expected location was '${RUNNER_TEMP}/customDbLocation/java' but actual was '${JAVA_DB}'"
+        if [[ ! -d "$GO_DB" ]] || [[ ! "$GO_DB" == "${RUNNER_TEMP}/customDbLocation/go" ]]; then
-            exit 1
+          echo "::error::Did not create a database for Go, or created it in the wrong location." \
-          fi
+            "Expected location was '${RUNNER_TEMP}/customDbLocation/go' but actual was '${GO_DB}'"
-          JAVASCRIPT_DB="${{ fromJson(steps.analysis.outputs.db-locations).javascript }}"
+          exit 1
-          if [[ ! -d "$JAVASCRIPT_DB" ]] || [[ ! "$JAVASCRIPT_DB" == "${RUNNER_TEMP}/customDbLocation/javascript" ]]; then
+        fi
-            echo "::error::Did not create a database for Javascript, or created it in the wrong location." \
+        JAVA_DB="${{ fromJson(steps.analysis.outputs.db-locations).java }}"
-              "Expected location was '${RUNNER_TEMP}/customDbLocation/javascript' but actual was '${JAVASCRIPT_DB}'"
+        if [[ ! -d "$JAVA_DB" ]] || [[ ! "$JAVA_DB" == "${RUNNER_TEMP}/customDbLocation/java" ]]; then
-            exit 1
+          echo "::error::Did not create a database for Java, or created it in the wrong location." \
-          fi
+            "Expected location was '${RUNNER_TEMP}/customDbLocation/java' but actual was '${JAVA_DB}'"
-          PYTHON_DB="${{ fromJson(steps.analysis.outputs.db-locations).python }}"
+          exit 1
-          if [[ ! -d "$PYTHON_DB" ]] || [[ ! "$PYTHON_DB" == "${RUNNER_TEMP}/customDbLocation/python" ]]; then
+        fi
-            echo "::error::Did not create a database for Python, or created it in the wrong location." \
+        JAVASCRIPT_DB="${{ fromJson(steps.analysis.outputs.db-locations).javascript }}"
-              "Expected location was '${RUNNER_TEMP}/customDbLocation/python' but actual was '${PYTHON_DB}'"
+        if [[ ! -d "$JAVASCRIPT_DB" ]] || [[ ! "$JAVASCRIPT_DB" == "${RUNNER_TEMP}/customDbLocation/javascript" ]]; then
-            exit 1
+          echo "::error::Did not create a database for Javascript, or created it in the wrong location." \
-          fi
+            "Expected location was '${RUNNER_TEMP}/customDbLocation/javascript' but actual was '${JAVASCRIPT_DB}'"
+          exit 1
+        fi
+        PYTHON_DB="${{ fromJson(steps.analysis.outputs.db-locations).python }}"
+        if [[ ! -d "$PYTHON_DB" ]] || [[ ! "$PYTHON_DB" == "${RUNNER_TEMP}/customDbLocation/python" ]]; then
+          echo "::error::Did not create a database for Python, or created it in the wrong location." \
+            "Expected location was '${RUNNER_TEMP}/customDbLocation/python' but actual was '${PYTHON_DB}'"
+          exit 1
+        fi
     env:
       CODEQL_ACTION_TEST_MODE: true

.github/workflows/__upload-ref-sha-input.yml

@@ -7,66 +7,113 @@ name: "PR Check - Upload-sarif: 'ref' and 'sha' from inputs"
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GO111MODULE: auto
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v2
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   upload-ref-sha-input:
     strategy:
-      fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: default
+          version: stable-20220908
-          - os: macos-latest
+        - os: macos-latest
-            version: default
+          version: stable-20220908
-          - os: windows-latest
+        - os: windows-latest
-            version: default
+          version: stable-20220908
+        - os: ubuntu-latest
+          version: stable-20221211
+        - os: macos-latest
+          version: stable-20221211
+        - os: windows-latest
+          version: stable-20221211
+        - os: ubuntu-latest
+          version: stable-20230418
+        - os: macos-latest
+          version: stable-20230418
+        - os: windows-latest
+          version: stable-20230418
+        - os: ubuntu-latest
+          version: stable-v2.13.5
+        - os: macos-latest
+          version: stable-v2.13.5
+        - os: windows-latest
+          version: stable-v2.13.5
+        - os: ubuntu-latest
+          version: stable-v2.14.6
+        - os: macos-latest
+          version: stable-v2.14.6
+        - os: windows-latest
+          version: stable-v2.14.6
+        - os: ubuntu-latest
+          version: default
+        - os: macos-latest
+          version: default
+        - os: windows-latest
+          version: default
+        - os: ubuntu-latest
+          version: latest
+        - os: macos-latest
+          version: latest
+        - os: windows-latest
+          version: latest
+        - os: ubuntu-latest
+          version: nightly-latest
+        - os: macos-latest
+          version: nightly-latest
+        - os: windows-latest
+          version: nightly-latest
     name: "Upload-sarif: 'ref' and 'sha' from inputs"
     permissions:
       contents: read
-      security-events: read
+      security-events: write
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Check out repository
+    - name: Check out repository
-        uses: actions/checkout@v4
+      uses: actions/checkout@v4
-      - name: Prepare test
+    - name: Prepare test
-        id: prepare-test
+      id: prepare-test
-        uses: ./.github/actions/prepare-test
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          version: ${{ matrix.version }}
+        version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
+        use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
+    - name: Set environment variable for Swift enablement
-      - uses: ./../action/init
+      if: >-
-        with:
+        runner.os != 'Windows' && (
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+            matrix.version == '20220908' ||
-          languages: cpp,csharp,java,javascript,python
+            matrix.version == '20221211'
-          config-file: ${{ github.repository }}/tests/multi-language-repo/.github/codeql/custom-queries.yml@${{
+        )
-            github.sha }}
+      shell: bash
-      - name: Build code
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-        shell: bash
+    - uses: ./../action/init
-        run: ./build.sh
+      with:
-  # Generate some SARIF we can upload with the upload-sarif step
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
-      - uses: ./../action/analyze
+        languages: cpp,csharp,java,javascript,python
-        with:
+        config-file: ${{ github.repository }}/tests/multi-language-repo/.github/codeql/custom-queries.yml@${{
-          ref: refs/heads/main
+          github.sha }}
-          sha: 5e235361806c361d4d3f8859e3c897658025a9a2
+    - name: Build code
-          upload: never
+      shell: bash
-      - uses: ./../action/upload-sarif
+      run: ./build.sh
-        with:
+    - uses: ./../action/analyze
-          ref: refs/heads/main
+      with:
-          sha: 5e235361806c361d4d3f8859e3c897658025a9a2
+        upload-database: false
+        ref: refs/heads/main
+        sha: 5e235361806c361d4d3f8859e3c897658025a9a2
+        upload: never
+    - uses: ./../action/upload-sarif
+      with:
+        ref: refs/heads/main
+        sha: 5e235361806c361d4d3f8859e3c897658025a9a2
     env:
       CODEQL_ACTION_TEST_MODE: true

.github/workflows/__with-checkout-path.yml

@@ -7,108 +7,157 @@ name: PR Check - Use a custom `checkout_path`
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GO111MODULE: auto
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v2
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   with-checkout-path:
     strategy:
-      fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: linked
+          version: stable-20220908
-          - os: macos-latest
+        - os: macos-latest
-            version: linked
+          version: stable-20220908
-          - os: windows-latest
+        - os: windows-latest
-            version: linked
+          version: stable-20220908
+        - os: ubuntu-latest
+          version: stable-20221211
+        - os: macos-latest
+          version: stable-20221211
+        - os: windows-latest
+          version: stable-20221211
+        - os: ubuntu-latest
+          version: stable-20230418
+        - os: macos-latest
+          version: stable-20230418
+        - os: windows-latest
+          version: stable-20230418
+        - os: ubuntu-latest
+          version: stable-v2.13.5
+        - os: macos-latest
+          version: stable-v2.13.5
+        - os: windows-latest
+          version: stable-v2.13.5
+        - os: ubuntu-latest
+          version: stable-v2.14.6
+        - os: macos-latest
+          version: stable-v2.14.6
+        - os: windows-latest
+          version: stable-v2.14.6
+        - os: ubuntu-latest
+          version: default
+        - os: macos-latest
+          version: default
+        - os: windows-latest
+          version: default
+        - os: ubuntu-latest
+          version: latest
+        - os: macos-latest
+          version: latest
+        - os: windows-latest
+          version: latest
+        - os: ubuntu-latest
+          version: nightly-latest
+        - os: macos-latest
+          version: nightly-latest
+        - os: windows-latest
+          version: nightly-latest
     name: Use a custom `checkout_path`
     permissions:
       contents: read
-      security-events: read
+      security-events: write
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Check out repository
+    - name: Check out repository
-        uses: actions/checkout@v4
+      uses: actions/checkout@v4
-      - name: Prepare test
+    - name: Prepare test
-        id: prepare-test
+      id: prepare-test
-        uses: ./.github/actions/prepare-test
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          version: ${{ matrix.version }}
+        version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
+        use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
+    - name: Set environment variable for Swift enablement
-      - name: Delete original checkout
+      if: >-
-        shell: bash
+        runner.os != 'Windows' && (
-        run: |
+            matrix.version == '20220908' ||
-          # delete the original checkout so we don't accidentally use it.
+            matrix.version == '20221211'
-          # Actions does not support deleting the current working directory, so we
+        )
-          # delete the contents of the directory instead.
+      shell: bash
-          rm -rf ./* .github .git
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-  # Check out the actions repo again, but at a different location.
+    - uses: actions/checkout@v4
-  # choose an arbitrary SHA so that we can later test that the commit_oid is not from main
+      with:
-      - uses: actions/checkout@v4
+        ref: 474bbf07f9247ffe1856c6a0f94aeeb10e7afee6
-        with:
+        path: x/y/z/some-path
-          ref: 474bbf07f9247ffe1856c6a0f94aeeb10e7afee6
+    - uses: ./../action/init
-          path: x/y/z/some-path
+      with:
-
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
-      - uses: ./../action/init
-        with:
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
       # it's enough to test one compiled language and one interpreted language
-          languages: csharp,javascript
+        languages: csharp,javascript
-          source-root: x/y/z/some-path/tests/multi-language-repo
+        source-path: x/y/z/some-path/tests/multi-language-repo
+        debug: true
+    - name: Build code (non-windows)
+      shell: bash
+      if: ${{ runner.os != 'Windows' }}
+      run: |
+        $CODEQL_RUNNER x/y/z/some-path/tests/multi-language-repo/build.sh
+    - name: Build code (windows)
+      shell: bash
+      if: ${{ runner.os == 'Windows' }}
+      run: |
+        x/y/z/some-path/tests/multi-language-repo/build.sh
+    - uses: ./../action/analyze
+      with:
+        checkout_path: x/y/z/some-path/tests/multi-language-repo
+        ref: v1.1.0
+        sha: 474bbf07f9247ffe1856c6a0f94aeeb10e7afee6
+        upload: never
+        upload-database: false
 
-      - name: Build code
+    - uses: ./../action/upload-sarif
-        shell: bash
+      with:
-        working-directory: x/y/z/some-path/tests/multi-language-repo
+        ref: v1.1.0
-        run: |
+        sha: 474bbf07f9247ffe1856c6a0f94aeeb10e7afee6
-          ./build.sh
+        checkout_path: x/y/z/some-path/tests/multi-language-repo
 
-      - uses: ./../action/analyze
+    - name: Verify SARIF after upload
-        with:
+      shell: bash
-          checkout_path: x/y/z/some-path/tests/multi-language-repo
+      run: |
-          ref: v1.1.0
+        EXPECTED_COMMIT_OID="474bbf07f9247ffe1856c6a0f94aeeb10e7afee6"
-          sha: 474bbf07f9247ffe1856c6a0f94aeeb10e7afee6
+        EXPECTED_REF="v1.1.0"
+        EXPECTED_CHECKOUT_URI_SUFFIX="/x/y/z/some-path/tests/multi-language-repo"
 
-      - name: Verify SARIF after upload
+        ACTUAL_COMMIT_OID="$(cat "$RUNNER_TEMP/payload.json" | jq -r .commit_oid)"
-        shell: bash
+        ACTUAL_REF="$(cat "$RUNNER_TEMP/payload.json" | jq -r .ref)"
-        run: |
+        ACTUAL_CHECKOUT_URI="$(cat "$RUNNER_TEMP/payload.json" | jq -r .checkout_uri)"
-          EXPECTED_COMMIT_OID="474bbf07f9247ffe1856c6a0f94aeeb10e7afee6"
-          EXPECTED_REF="v1.1.0"
-          EXPECTED_CHECKOUT_URI_SUFFIX="/x/y/z/some-path/tests/multi-language-repo"
 
-          ACTUAL_COMMIT_OID="$(cat "$RUNNER_TEMP/payload.json" | jq -r .commit_oid)"
+        if [[ "$EXPECTED_COMMIT_OID" != "$ACTUAL_COMMIT_OID" ]]; then
-          ACTUAL_REF="$(cat "$RUNNER_TEMP/payload.json" | jq -r .ref)"
+          echo "::error Invalid commit oid. Expected: $EXPECTED_COMMIT_OID Actual: $ACTUAL_COMMIT_OID"
-          ACTUAL_CHECKOUT_URI="$(cat "$RUNNER_TEMP/payload.json" | jq -r .checkout_uri)"
+          echo "$RUNNER_TEMP/payload.json"
+          exit 1
+        fi
 
-          if [[ "$EXPECTED_COMMIT_OID" != "$ACTUAL_COMMIT_OID" ]]; then
+        if [[ "$EXPECTED_REF" != "$ACTUAL_REF" ]]; then
-            echo "::error Invalid commit oid. Expected: $EXPECTED_COMMIT_OID Actual: $ACTUAL_COMMIT_OID"
+          echo "::error Invalid ref. Expected: '$EXPECTED_REF' Actual: '$ACTUAL_REF'"
-            echo "$RUNNER_TEMP/payload.json"
+          echo "$RUNNER_TEMP/payload.json"
-            exit 1
+          exit 1
-          fi
+        fi
 
-          if [[ "$EXPECTED_REF" != "$ACTUAL_REF" ]]; then
+        if [[ "$ACTUAL_CHECKOUT_URI" != *$EXPECTED_CHECKOUT_URI_SUFFIX ]]; then
-            echo "::error Invalid ref. Expected: '$EXPECTED_REF' Actual: '$ACTUAL_REF'"
+          echo "::error Invalid checkout URI suffix. Expected suffix: $EXPECTED_CHECKOUT_URI_SUFFIX Actual uri: $ACTUAL_CHECKOUT_URI"
-            echo "$RUNNER_TEMP/payload.json"
+          echo "$RUNNER_TEMP/payload.json"
-            exit 1
+          exit 1
-          fi
+        fi
-
-          if [[ "$ACTUAL_CHECKOUT_URI" != *$EXPECTED_CHECKOUT_URI_SUFFIX ]]; then
-            echo "::error Invalid checkout URI suffix. Expected suffix: $EXPECTED_CHECKOUT_URI_SUFFIX Actual uri: $ACTUAL_CHECKOUT_URI"
-            echo "$RUNNER_TEMP/payload.json"
-            exit 1
-          fi
     env:
       CODEQL_ACTION_TEST_MODE: true

.github/workflows/__zstd-bundle-streaming.yml

@@ -1,110 +0,0 @@
-# Warning: This file is generated automatically, and should not be modified.
-# Instead, please modify the template in the pr-checks directory and run:
-#     (cd pr-checks; pip install ruamel.yaml@0.17.31 && python3 sync.py)
-# to regenerate this file.
-
-name: PR Check - Zstandard bundle (streaming)
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  GO111MODULE: auto
-on:
-  push:
-    branches:
-      - main
-      - releases/v*
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
-  workflow_dispatch: {}
-jobs:
-  zstd-bundle-streaming:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: macos-latest
-            version: linked
-          - os: ubuntu-latest
-            version: linked
-    name: Zstandard bundle (streaming)
-    permissions:
-      contents: read
-      security-events: read
-    timeout-minutes: 45
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
-      - name: Remove CodeQL from toolcache
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const fs = require('fs');
-            const path = require('path');
-            const codeqlPath = path.join(process.env['RUNNER_TOOL_CACHE'], 'CodeQL');
-            if (codeqlPath !== undefined) {
-              fs.rmdirSync(codeqlPath, { recursive: true });
-            }
-      - id: init
-        uses: ./../action/init
-        with:
-          languages: javascript
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
-      - uses: ./../action/analyze
-        with:
-          output: ${{ runner.temp }}/results
-          upload-database: false
-      - name: Upload SARIF
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.os }}-zstd-bundle.sarif
-          path: ${{ runner.temp }}/results/javascript.sarif
-          retention-days: 7
-      - name: Check diagnostic with expected tools URL appears in SARIF
-        uses: actions/github-script@v7
-        env:
-          SARIF_PATH: ${{ runner.temp }}/results/javascript.sarif
-        with:
-          script: |
-            const fs = require('fs');
-
-            const sarif = JSON.parse(fs.readFileSync(process.env['SARIF_PATH'], 'utf8'));
-            const run = sarif.runs[0];
-
-            const toolExecutionNotifications = run.invocations[0].toolExecutionNotifications;
-            const downloadTelemetryNotifications = toolExecutionNotifications.filter(n =>
-              n.descriptor.id === 'codeql-action/bundle-download-telemetry'
-            );
-            if (downloadTelemetryNotifications.length !== 1) {
-              core.setFailed(
-                'Expected exactly one reporting descriptor in the ' +
-                  `'runs[].invocations[].toolExecutionNotifications[]' SARIF property, but found ` +
-                  `${downloadTelemetryNotifications.length}. All notification reporting descriptors: ` +
-                  `${JSON.stringify(toolExecutionNotifications)}.`
-              );
-            }
-
-            const toolsUrl = downloadTelemetryNotifications[0].properties.attributes.toolsUrl;
-            console.log(`Found tools URL: ${toolsUrl}`);
-
-            if (!toolsUrl.endsWith('.tar.zst')) {
-              core.setFailed(
-                `Expected the tools URL to be a .tar.zst file, but found ${toolsUrl}.`
-              );
-            }
-    env:
-      CODEQL_ACTION_ZSTD_BUNDLE: true
-      CODEQL_ACTION_ZSTD_BUNDLE_STREAMING_EXTRACTION: true
-      CODEQL_ACTION_TEST_MODE: true

.github/workflows/__zstd-bundle.yml

@@ -1,113 +0,0 @@
-# Warning: This file is generated automatically, and should not be modified.
-# Instead, please modify the template in the pr-checks directory and run:
-#     (cd pr-checks; pip install ruamel.yaml@0.17.31 && python3 sync.py)
-# to regenerate this file.
-
-name: PR Check - Zstandard bundle
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  GO111MODULE: auto
-on:
-  push:
-    branches:
-      - main
-      - releases/v*
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
-  workflow_dispatch: {}
-jobs:
-  zstd-bundle:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: macos-latest
-            version: linked
-          - os: ubuntu-latest
-            version: linked
-          - os: windows-latest
-            version: linked
-    name: Zstandard bundle
-    permissions:
-      contents: read
-      security-events: read
-    timeout-minutes: 45
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-          setup-kotlin: 'true'
-      - name: Remove CodeQL from toolcache
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const fs = require('fs');
-            const path = require('path');
-            const codeqlPath = path.join(process.env['RUNNER_TOOL_CACHE'], 'CodeQL');
-            if (codeqlPath !== undefined) {
-              fs.rmdirSync(codeqlPath, { recursive: true });
-            }
-      - id: init
-        uses: ./../action/init
-        with:
-          languages: javascript
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
-      - uses: ./../action/analyze
-        with:
-          output: ${{ runner.temp }}/results
-          upload-database: false
-      - name: Upload SARIF
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.os }}-zstd-bundle.sarif
-          path: ${{ runner.temp }}/results/javascript.sarif
-          retention-days: 7
-      - name: Check diagnostic with expected tools URL appears in SARIF
-        uses: actions/github-script@v7
-        env:
-          SARIF_PATH: ${{ runner.temp }}/results/javascript.sarif
-        with:
-          script: |
-            const fs = require('fs');
-
-            const sarif = JSON.parse(fs.readFileSync(process.env['SARIF_PATH'], 'utf8'));
-            const run = sarif.runs[0];
-
-            const toolExecutionNotifications = run.invocations[0].toolExecutionNotifications;
-            const downloadTelemetryNotifications = toolExecutionNotifications.filter(n =>
-              n.descriptor.id === 'codeql-action/bundle-download-telemetry'
-            );
-            if (downloadTelemetryNotifications.length !== 1) {
-              core.setFailed(
-                'Expected exactly one reporting descriptor in the ' +
-                  `'runs[].invocations[].toolExecutionNotifications[]' SARIF property, but found ` +
-                  `${downloadTelemetryNotifications.length}. All notification reporting descriptors: ` +
-                  `${JSON.stringify(toolExecutionNotifications)}.`
-              );
-            }
-
-            const toolsUrl = downloadTelemetryNotifications[0].properties.attributes.toolsUrl;
-            console.log(`Found tools URL: ${toolsUrl}`);
-
-            const expectedExtension = process.env['RUNNER_OS'] === 'Windows' ? '.tar.gz' : '.tar.zst';
-
-            if (!toolsUrl.endsWith(expectedExtension)) {
-              core.setFailed(
-                `Expected the tools URL to be a ${expectedExtension} file, but found ${toolsUrl}.`
-              );
-            }
-    env:
-      CODEQL_ACTION_ZSTD_BUNDLE: true
-      CODEQL_ACTION_TEST_MODE: true

.github/workflows/check-expected-release-files.yml

@@ -13,9 +13,6 @@ jobs:
   check-expected-release-files:
     runs-on: ubuntu-latest
 
-    permissions:
-      contents: read
-
     steps:
       - name: Checkout CodeQL Action
         uses: actions/checkout@v4

.github/workflows/codeql.yml

@@ -2,16 +2,15 @@ name: "CodeQL action"
 
 on:
   push:
-    branches: [main, releases/v*]
+    branches: [main, releases/v2]
   pull_request:
-    branches: [main, releases/v*]
+    branches: [main, releases/v2]
     # Run checks on reopened draft PRs to support triggering PR checks on draft PRs that were opened
     # by other workflows.
     types: [opened, synchronize, reopened, ready_for_review]
   schedule:
     # Weekly on Sunday.
     - cron: '30 1 * * 0'
-  workflow_dispatch:
 
 env:
   CODEQL_ACTION_TESTING_ENVIRONMENT: codeql-action-pr-checks
@@ -24,7 +23,7 @@ jobs:
       versions: ${{ steps.compare.outputs.versions }}
 
     permissions:
-      contents: read
+      security-events: write
 
     steps:
     - uses: actions/checkout@v4
@@ -41,7 +40,7 @@ jobs:
       id: init-latest
       uses: ./init
       with:
-        tools: linked
+        tools: latest
         languages: javascript
     - name: Compare default and latest CodeQL bundle versions
       id: compare
@@ -54,33 +53,31 @@ jobs:
         echo "Default CodeQL bundle version is $CODEQL_VERSION_DEFAULT"
         echo "Latest CodeQL bundle version is $CODEQL_VERSION_LATEST"
 
-        # If we're running on a pull request, run with both bundles, even if `tools: linked` would
+        # If we're running on a pull request, run with both bundles, even if `tools: latest` would
         # be the same as `tools: null`. This allows us to make the job for each of the bundles a
         # required status check.
         #
-        # If we're running on push or schedule, then we can skip running with `tools: linked` when it would be
+        # If we're running on push or schedule, then we can skip running with `tools: latest` when it would be
         # the same as running with `tools: null`.
         if [[ "$GITHUB_EVENT_NAME" != "pull_request" && "$CODEQL_VERSION_DEFAULT" == "$CODEQL_VERSION_LATEST" ]]; then
           VERSIONS_JSON='[null]'
         else
-          VERSIONS_JSON='[null, "linked"]'
+          VERSIONS_JSON='[null, "latest"]'
         fi
 
         # Output a JSON-encoded list with the distinct versions to test against.
         echo "Suggested matrix config for analysis job: $VERSIONS_JSON"
         echo "versions=${VERSIONS_JSON}" >> $GITHUB_OUTPUT
 
-  analyze-javascript:
+  build:
     needs: [check-codeql-versions]
     strategy:
-      fail-fast: false
       matrix:
-        os: [ubuntu-22.04,ubuntu-24.04,windows-2019,windows-2022,macos-13,macos-14]
+        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) }}
     runs-on: ${{ matrix.os }}
 
     permissions:
-      contents: read
       security-events: write
 
     steps:
@@ -98,29 +95,3 @@ jobs:
       run: ${{steps.init.outputs.codeql-path}} version --format=json
     - name: Perform CodeQL Analysis
       uses: ./analyze
-      with:
-        category: "/language:javascript"
-
-
-  analyze-actions:
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-
-    permissions:
-      contents: read
-      security-events: write
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-    - name: Initialize CodeQL
-      uses: ./init
-      with:
-        languages: actions
-        config-file: ./.github/codeql/codeql-actions-config.yml
-    - name: Perform CodeQL Analysis
-      uses: ./analyze
-      with:
-        category: "/language:actions"

.github/workflows/codescanning-config-cli.yml

@@ -3,39 +3,32 @@
 name: Code-Scanning config CLI tests
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  CODEQL_PASS_CONFIG_TO_CLI: true
 
 on:
   push:
     branches:
     - main
-    - releases/v*
+    - releases/v2
   pull_request:
     types:
     - opened
     - synchronize
     - reopened
     - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 
 jobs:
   code-scanning-config-tests:
     continue-on-error: true
 
-    permissions:
-      contents: read
-      packages: read
-      security-events: read
-
     strategy:
-      fail-fast: false
       matrix:
         include:
         - os: ubuntu-latest
-          version: linked
+          version: latest
         - os: macos-latest
-          version: linked
+          version: latest
         - os: ubuntu-latest
           version: default
         - os: macos-latest
@@ -211,3 +204,15 @@ jobs:
         packs: + codeql/javascript-queries
         config-file-test: .github/codeql/other-config-properties.yml
         tools: ${{ steps.prepare-test.outputs.tools-url }}
+
+    - name: Config not generated when env var is not set
+      if: success() || failure()
+      env:
+        CODEQL_PASS_CONFIG_TO_CLI: false
+      uses: ./../action/.github/actions/check-codescanning-config
+      with:
+        expected-config-file-contents: ""
+        languages: javascript
+        packs: + codeql/javascript-queries
+        config-file-test: .github/codeql/other-config-properties.yml
+        tools: ${{ steps.prepare-test.outputs.tools-url }}

.github/workflows/debug-artifacts-failure-safe.yml

@@ -1,102 +0,0 @@
-# Checks logs, SARIF, and database bundle debug artifacts exist
-# when the analyze step fails.
-name: PR Check - Debug artifacts after failure
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-on:
-  push:
-    branches:
-    - main
-    - releases/v*
-  pull_request:
-    types:
-    - opened
-    - synchronize
-    - reopened
-    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
-  workflow_dispatch: {}
-jobs:
-  upload-artifacts:
-    strategy:
-      fail-fast: false
-      matrix:
-        version:
-        - stable-v2.20.3
-        - default
-        - linked
-        - nightly-latest
-    name: Upload debug artifacts after failure in analyze
-    continue-on-error: true
-    env:
-      CODEQL_ACTION_TEST_MODE: true
-    permissions:
-      contents: read
-    timeout-minutes: 45
-    runs-on: ubuntu-latest
-    steps:
-      - name: Dump GitHub event
-        run: cat "${GITHUB_EVENT_PATH}"
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-      - uses: actions/setup-go@v5
-        with:
-          go-version: ^1.13.1
-      - uses: ./../action/init
-        with:
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
-          debug: true
-          debug-artifact-name: my-debug-artifacts
-          debug-database-name: my-db
-      - name: Build code
-        shell: bash
-        run: ./build.sh
-      - uses: ./../action/analyze
-        id: analysis
-        env:
-          # Forces a failure in this step.
-          CODEQL_ACTION_EXTRA_OPTIONS: '{ "database": { "finalize": ["--invalid-option"] } }'
-        with:
-          expect-error: true
-  download-and-check-artifacts:
-    name: Download and check debug artifacts after failure in analyze
-    needs: upload-artifacts
-    timeout-minutes: 45
-    permissions:
-      contents: read
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download all artifacts
-        uses: actions/download-artifact@v4
-      - name: Check expected artifacts exist
-        shell: bash
-        run: |
-          LANGUAGES="cpp csharp go java javascript python"
-          for version in $VERSIONS; do
-            echo "Artifacts from version $version:"
-            pushd "./my-debug-artifacts-${version//./}"
-            for language in $LANGUAGES; do
-              echo "- Checking $language"
-              if [[ ! -f "my-db-$language-partial.zip" ]] ; then
-                echo "Missing a partial database bundle for $language"
-                exit 1
-              fi
-              if [[ ! -d "log" ]] ; then
-                echo "Missing database initialization logs"
-                exit 1
-              fi
-              if [[ ! "$language" == "go" ]] && [[ ! -d "$language/log" ]] ; then
-                echo "Missing logs for $language"
-                exit 1
-              fi
-            done
-            popd
-          done
-        env:
-          GO111MODULE: auto

.github/workflows/debug-artifacts-failure.yml

@@ -0,0 +1,93 @@
+# Checks logs, SARIF, and database bundle debug artifacts exist
+# when the analyze step fails.
+name: PR Check - Debug artifacts after failure
+env:
+  # Disable Kotlin analysis while it's incompatible with Kotlin 1.8, until we find a
+  # workaround for our PR checks.
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: true
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+on:
+  push:
+    branches:
+    - main
+    - releases/v2
+  pull_request:
+    types:
+    - opened
+    - synchronize
+    - reopened
+    - ready_for_review
+  workflow_dispatch: {}
+jobs:
+  upload-artifacts:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+    name: Upload debug artifacts after failure in analyze
+    continue-on-error: true
+    env:
+      CODEQL_ACTION_TEST_MODE: true
+    timeout-minutes: 45
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Dump GitHub event
+        run: cat "${GITHUB_EVENT_PATH}"
+      - name: Check out repository
+        uses: actions/checkout@v4
+      - name: Prepare test
+        id: prepare-test
+        uses: ./.github/actions/prepare-test
+        with:
+          version: latest
+      - uses: actions/setup-go@v4
+        with:
+          go-version: ^1.13.1
+      - uses: ./../action/init
+        with:
+          tools: ${{ steps.prepare-test.outputs.tools-url }}
+          debug: true
+          debug-artifact-name: my-debug-artifacts
+          debug-database-name: my-db
+      - name: Build code
+        shell: bash
+        run: ./build.sh
+      - uses: ./../action/analyze
+        id: analysis  
+        with:
+          expect-error: true
+          ram: 1
+  download-and-check-artifacts:
+    name: Download and check debug artifacts after failure in analyze
+    needs: upload-artifacts
+    timeout-minutes: 45
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download all artifacts
+        uses: actions/download-artifact@v3
+      - name: Check expected artifacts exist
+        shell: bash
+        run: |
+          OPERATING_SYSTEMS="ubuntu-latest macos-latest"
+          LANGUAGES="cpp csharp go java javascript python"
+          for os in $OPERATING_SYSTEMS; do
+            pushd "./my-debug-artifacts-$os"
+            echo "Artifacts from run on $os:"
+            for language in $LANGUAGES; do
+              echo "- Checking $language"
+              if [[ ! -f "my-db-$language-partial.zip" ]] ; then
+                echo "Missing a partial database bundle for $language"
+                exit 1
+              fi
+              if [[ ! -d "log" ]] ; then
+                echo "Missing database initialization logs"
+                exit 1
+              fi
+              if [[ ! "$language" == "go" ]] && [[ ! -d "$language/log" ]] ; then
+                echo "Missing logs for $language"
+                exit 1
+              fi
+            done
+            popd
+          done
+        env:
+          GO111MODULE: auto

.github/workflows/debug-artifacts-safe.yml

@@ -1,97 +0,0 @@
-# Checks logs, SARIF, and database bundle debug artifacts exist.
-name: PR Check - Debug artifact upload
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-on:
-  push:
-    branches:
-    - main
-    - releases/v*
-  pull_request:
-    types:
-    - opened
-    - synchronize
-    - reopened
-    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
-  workflow_dispatch: {}
-jobs:
-  upload-artifacts:
-    strategy:
-      fail-fast: false
-      matrix:
-        version:
-        - stable-v2.20.3
-        - default
-        - linked
-        - nightly-latest
-    name: Upload debug artifacts
-    env:
-      CODEQL_ACTION_TEST_MODE: true
-    timeout-minutes: 45
-    permissions:
-      contents: read
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-      - uses: actions/setup-go@v5
-        with:
-          go-version: ^1.13.1
-      - uses: ./../action/init
-        id: init
-        with:
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
-          debug: true
-          debug-artifact-name: my-debug-artifacts
-          debug-database-name: my-db
-          # We manually exclude Swift from the languages list here, as it is not supported on Ubuntu
-          languages: cpp,csharp,go,java,javascript,python,ruby
-      - name: Build code
-        shell: bash
-        run: ./build.sh
-      - uses: ./../action/analyze
-        id: analysis
-  download-and-check-artifacts:
-    name: Download and check debug artifacts
-    needs: upload-artifacts
-    timeout-minutes: 45
-    permissions:
-      contents: read
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download all artifacts
-        uses: actions/download-artifact@v4
-      - name: Check expected artifacts exist
-        shell: bash
-        run: |
-          VERSIONS="stable-v2.20.3 default linked nightly-latest"
-          LANGUAGES="cpp csharp go java javascript python"
-          for version in $VERSIONS; do
-            pushd "./my-debug-artifacts-${version//./}"
-            echo "Artifacts from version $version:"
-            for language in $LANGUAGES; do
-              echo "- Checking $language"
-              if [[ ! -f "$language.sarif" ]] ; then
-                echo "Missing a SARIF file for $language"
-                exit 1
-              fi
-              if [[ ! -f "my-db-$language.zip" ]] ; then
-                echo "Missing a database bundle for $language"
-                exit 1
-              fi
-              if [[ ! -d "$language/log" ]] ; then
-                echo "Missing logs for $language"
-                exit 1
-              fi
-            done
-            popd
-          done
-        env:
-          GO111MODULE: auto

.github/workflows/debug-artifacts.yml

@@ -0,0 +1,103 @@
+# Checks logs, SARIF, and database bundle debug artifacts exist.
+name: PR Check - Debug artifact upload
+env:
+  # Disable Kotlin analysis while it's incompatible with Kotlin 1.8, until we find a
+  # workaround for our PR checks.
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: true
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+on:
+  push:
+    branches:
+    - main
+    - releases/v2
+  pull_request:
+    types:
+    - opened
+    - synchronize
+    - reopened
+    - ready_for_review
+  workflow_dispatch: {}
+jobs:
+  upload-artifacts:
+    strategy:
+      matrix:
+        os:
+        - ubuntu-latest
+        - macos-latest
+        version:
+        - stable-20220908
+        - stable-20221211
+        - stable-20230418
+        - stable-v2.13.5
+        - stable-v2.14.6
+        - default
+        - latest
+        - nightly-latest
+    name: Upload debug artifacts
+    env:
+      CODEQL_ACTION_TEST_MODE: true
+    timeout-minutes: 45
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+      - name: Prepare test
+        id: prepare-test
+        uses: ./.github/actions/prepare-test
+        with:
+          version: ${{ matrix.version }}
+      - uses: actions/setup-go@v4
+        with:
+          go-version: ^1.13.1
+      - uses: ./../action/init
+        id: init
+        with:
+          tools: ${{ steps.prepare-test.outputs.tools-url }}
+          debug: true
+          debug-artifact-name: my-debug-artifacts
+          debug-database-name: my-db
+      - uses: ./../action/.github/actions/setup-swift
+        with:
+          codeql-path: ${{ steps.init.outputs.codeql-path }}
+      - name: Build code
+        shell: bash
+        run: ./build.sh
+      - uses: ./../action/analyze
+        id: analysis  
+  download-and-check-artifacts:
+    name: Download and check debug artifacts
+    needs: upload-artifacts
+    timeout-minutes: 45
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download all artifacts
+        uses: actions/download-artifact@v3
+      - name: Check expected artifacts exist
+        shell: bash
+        run: |
+          VERSIONS="stable-20220908 stable-20221211 stable-20230418 stable-v2.13.5 stable-v2.14.6 default latest nightly-latest"
+          LANGUAGES="cpp csharp go java javascript python"
+          for version in $VERSIONS; do
+            for os in ubuntu-latest macos-latest; do
+              pushd "./my-debug-artifacts-$os-${version//./}"
+              echo "Artifacts from version $version on $os:"
+              for language in $LANGUAGES; do
+                echo "- Checking $language"
+                if [[ ! -f "$language.sarif" ]] ; then
+                  echo "Missing a SARIF file for $language"
+                  exit 1
+                fi
+                if [[ ! -f "my-db-$language.zip" ]] ; then
+                  echo "Missing a database bundle for $language"
+                  exit 1
+                fi
+                if [[ ! -d "$language/log" ]] ; then
+                  echo "Missing logs for $language"
+                  exit 1
+                fi
+              done
+              popd
+            done
+          done
+        env:
+          GO111MODULE: auto

.github/workflows/expected-queries-runs.yml

@@ -4,15 +4,13 @@ on:
   push:
     branches:
     - main
-    - releases/v*
+    - releases/v2
   pull_request:
     types:
     - opened
     - synchronize
     - reopened
     - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 
 jobs:
@@ -22,9 +20,6 @@ jobs:
       CODEQL_ACTION_TEST_MODE: true
     timeout-minutes: 45
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      security-events: read
     steps:
     - name: Check out repository
       uses: actions/checkout@v4
@@ -32,7 +27,7 @@ jobs:
       id: prepare-test
       uses: ./.github/actions/prepare-test
       with:
-        version: linked
+        version: latest
     - uses: ./../action/init
       with:
         languages: javascript
@@ -40,6 +35,8 @@ jobs:
     - uses: ./../action/analyze
       with:
         output: ${{ runner.temp }}/results
+        upload-database: false
+        upload: never
 
     - name: Check Sarif
       uses: ./../action/.github/actions/check-sarif

.github/workflows/post-release-mergeback.yml

@@ -1,9 +1,9 @@
-# This workflow runs after a merge to any release branch of the action. It:
+# This workflow runs after a release of the action. It:
-# 1. Tags the merge commit on the release branch that represents the new release with an `vN.x.y`
+# 1. Merges any changes from the release back into the main branch. Typically, this is just a single
+#    commit that updates the changelog.
+# 2. Tags the merge commit on the release branch that represents the new release with an `v2.x.y`
 #    tag
-# 2. Updates the `vN` tag to refer to this merge commit.
+# 3. Updates the `v2` tag to refer to this merge commit.
-# 3. Iff vN == vLatest, merges any changes from the release back into the main branch.
-#    Typically, this is two commits – one to update the version number and one to update dependencies.
 name: Tag release and merge back
 
 on:
@@ -16,21 +16,16 @@ on:
 
   push:
     branches:
-      - releases/v*
+      - releases/v2
 
 jobs:
   merge-back:
     runs-on: ubuntu-latest
-    environment: Automation
     if: github.repository == 'github/codeql-action'
     env:
       BASE_BRANCH: "${{ github.event.inputs.baseBranch || 'main' }}"
       HEAD_BRANCH: "${{ github.head_ref || github.ref }}"
 
-    permissions:
-      contents: write # needed to create tags and push commits
-      pull-requests: write
-
     steps:
       - name: Dump environment
         run: env
@@ -41,9 +36,7 @@ jobs:
         run: echo "${GITHUB_CONTEXT}"
 
       - uses: actions/checkout@v4
-        with:
+      - uses: actions/setup-node@v3
-          fetch-depth: 0  # ensure we have all tags and can push commits
-      - uses: actions/setup-node@v4
 
       - name: Update git config
         run: |
@@ -58,8 +51,6 @@ jobs:
           short_sha="${GITHUB_SHA:0:8}"
           NEW_BRANCH="mergeback/${VERSION}-to-${BASE_BRANCH}-${short_sha}"
           echo "newBranch=${NEW_BRANCH}" >> $GITHUB_OUTPUT
-          LATEST_RELEASE_BRANCH=$(git branch -r | grep -E "origin/releases/v[0-9]+$" | sed 's/origin\///g' | sort -V | tail -1 | xargs)
-          echo "latest_release_branch=${LATEST_RELEASE_BRANCH}" >> $GITHUB_OUTPUT
 
       - name: Dump branches
         env:
@@ -68,8 +59,6 @@ jobs:
           echo "BASE_BRANCH ${BASE_BRANCH}"
           echo "HEAD_BRANCH ${HEAD_BRANCH}"
           echo "NEW_BRANCH ${NEW_BRANCH}"
-          echo "LATEST_RELEASE_BRANCH ${LATEST_RELEASE_BRANCH}"
-          echo "GITHUB_REF ${GITHUB_REF}"
 
       - name: Create mergeback branch
         env:
@@ -100,6 +89,8 @@ jobs:
         env:
           VERSION: ${{ steps.getVersion.outputs.version }}
         run: |
+          # Unshallow the repo in order to allow pushes
+          git fetch --unshallow
           # Create the `vx.y.z` tag
           git tag --annotate "${VERSION}" --message "${VERSION}"
           # Update the `vx` tag
@@ -108,24 +99,13 @@ jobs:
           git tag --annotate "${major_version_tag}" --message "${major_version_tag}" --force
           # Push the tags, using:
           # - `--atomic` to make sure we either update both tags or neither (an intermediate state,
-          #   e.g. where we update the vN.x.y tag on the remote but not the vN tag, could result in
+          #   e.g. where we update the v2.x.y tag on the remote but not the v2 tag, could result in
-          #   unwanted Dependabot updates, e.g. from vN to vN.x.y)
+          #   unwanted Dependabot updates, e.g. from v2 to v2.x.y)
-          # - `--force` since we're overwriting the `vN` tag
+          # - `--force` since we're overwriting the `vx` tag
           git push origin --atomic --force refs/tags/"${VERSION}" refs/tags/"${major_version_tag}"
 
-      - name: Prepare partial Changelog
-        env:
-          PARTIAL_CHANGELOG: "${{ runner.temp }}/partial_changelog.md"
-          VERSION: "${{ steps.getVersion.outputs.version }}"
-        run: |
-          python .github/workflows/script/prepare_changelog.py CHANGELOG.md "$VERSION" > $PARTIAL_CHANGELOG
-
-          echo "::group::Partial CHANGELOG"
-          cat $PARTIAL_CHANGELOG
-          echo "::endgroup::"
-
       - name: Create mergeback branch
-        if: ${{ steps.check.outputs.exists != 'true' && endsWith(github.ref_name, steps.getVersion.outputs.latest_release_branch) }}
+        if: steps.check.outputs.exists != 'true'
         env:
           VERSION: "${{ steps.getVersion.outputs.version }}"
           NEW_BRANCH: "${{ steps.getVersion.outputs.newBranch }}"
@@ -149,8 +129,8 @@ jobs:
           # Update the version number ready for the next release
           npm version patch --no-git-tag-version
 
-          # Update the changelog, adding a new version heading directly above the most recent existing one
+          # Update the changelog
-          awk '!f && /##/{print "'"## [UNRELEASED]\n\nNo user facing changes.\n"'"; f=1}1' CHANGELOG.md > temp && mv temp CHANGELOG.md
+          perl -i -pe 's/^/## \[UNRELEASED\]\n\nNo user facing changes.\n\n/ if($.==5)' CHANGELOG.md
           git add .
           git commit -m "Update changelog and version after ${VERSION}"
 
@@ -166,23 +146,3 @@ jobs:
             --body "${pr_body}" \
             --assignee "${GITHUB_ACTOR}" \
             --draft
-
-      - name: Generate token
-        uses: actions/create-github-app-token@v2.0.2
-        id: app-token
-        with:
-          app-id: ${{ vars.AUTOMATION_APP_ID }}
-          private-key: ${{ secrets.AUTOMATION_PRIVATE_KEY }}
-
-      - name: Create the GitHub release
-        env:
-          PARTIAL_CHANGELOG: "${{ runner.temp }}/partial_changelog.md"
-          VERSION: "${{ steps.getVersion.outputs.version }}"
-          GH_TOKEN: ${{ steps.app-token.outputs.token }}
-        run: |
-          # Do not mark this release as latest. The most recent CLI release must be marked as latest.
-          gh release create \
-            "$VERSION" \
-            --latest=false \
-            --title "$VERSION" \
-            --notes-file "$PARTIAL_CHANGELOG"

.github/workflows/pr-checks.yml

@@ -2,6 +2,7 @@ name: PR Checks
 
 on:
   push:
+    branches: [main, releases/v2]
   pull_request:
     # Run checks on reopened draft PRs to support triggering PR checks on draft PRs that were opened
     # by other workflows.
@@ -13,35 +14,19 @@ jobs:
     name: Check JS
     runs-on: ubuntu-latest
     timeout-minutes: 45
-    permissions:
-      contents: read
-      security-events: write # needed to upload ESLint results
-
-    strategy:
-      fail-fast: false
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Lint
-        id: lint
+        run: npm run-script lint
-        run: npm run-script lint-ci
-
-      - name: Upload sarif
-        uses: github/codeql-action/upload-sarif@v3
-        with:
-          sarif_file: eslint.sarif
-          category: eslint
 
       - name: Check generated JS
         run: .github/workflows/script/check-js.sh
 
   check-node-modules:
-    if: github.event_name != 'push' || github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/releases/v')
     name: Check modules up to date
-    permissions:
-      contents: read
     runs-on: macos-latest
     timeout-minutes: 45
 
@@ -51,10 +36,7 @@ jobs:
         run: .github/workflows/script/check-node-modules.sh
 
   check-file-contents:
-    if: github.event_name != 'push' || github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/releases/v')
     name: Check file contents
-    permissions:
-      contents: read
     runs-on: ubuntu-latest
     timeout-minutes: 45
 
@@ -63,7 +45,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v4
         with:
           python-version: 3.11
 
@@ -78,15 +60,11 @@ jobs:
         run: .github/workflows/script/verify-pr-checks.sh
 
   npm-test:
-    if: github.event_name != 'push' || github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/releases/v')
     name: Unit Test
     needs: [check-js, check-node-modules]
     strategy:
-      fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-    permissions:
-      contents: read
     runs-on: ${{ matrix.os }}
     timeout-minutes: 45
 
@@ -98,47 +76,3 @@ jobs:
           # we won't be able to find them on Windows.
           npm config set script-shell bash
           npm test
-
-  check-node-version:
-    if: github.event.pull_request
-    name: Check Action Node versions
-    runs-on: ubuntu-latest
-    timeout-minutes: 45
-    env:
-      BASE_REF: ${{ github.base_ref }}
-
-    permissions:
-      contents: read
-
-    steps:
-      - uses: actions/checkout@v4
-      - id: head-version
-        name: Verify all Actions use the same Node version
-        run: |
-          NODE_VERSION=$(find . -name "action.yml" -exec yq -e '.runs.using' {} \; | grep node | sort | uniq)
-          echo "NODE_VERSION: ${NODE_VERSION}"
-          if [[ $(echo "$NODE_VERSION" | wc -l) -gt 1 ]]; then
-            echo "::error::More than one node version used in 'action.yml' files."
-            exit 1
-          fi
-          echo "node_version=${NODE_VERSION}" >> $GITHUB_OUTPUT
-
-      - id: checkout-base
-        name: 'Backport: Check out base ref'
-        if: ${{ startsWith(github.head_ref, 'backport-') }}
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.BASE_REF }}
-
-      - name: 'Backport: Verify Node versions unchanged'
-        if: steps.checkout-base.outcome == 'success'
-        env:
-          HEAD_VERSION: ${{ steps.head-version.outputs.node_version }}
-        run: |
-          BASE_VERSION=$(find . -name "action.yml" -exec yq -e '.runs.using' {} \; | grep node | sort | uniq)
-          echo "HEAD_VERSION: ${HEAD_VERSION}"
-          echo "BASE_VERSION: ${BASE_VERSION}"
-          if [[ "$BASE_VERSION" != "$HEAD_VERSION" ]]; then
-            echo "::error::Cannot change the Node version of an Action in a backport PR."
-            exit 1
-          fi

.github/workflows/publish-immutable-action.yml

@@ -1,35 +0,0 @@
-name: 'Publish Immutable Action Version'
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      id-token: write
-      packages: write
-
-    steps:
-      - name: Check release name
-        id: check
-        env:
-          RELEASE_NAME: ${{ github.event.release.name }}
-        run: |
-          echo "Release name: ${{ github.event.release.name }}"
-          if [[ $RELEASE_NAME == v* ]]; then
-            echo "This is a CodeQL Action release. Create an Immutable Action"
-            echo "is-action-release=true" >> $GITHUB_OUTPUT
-          else
-            echo "This is a CodeQL Bundle release. Do not create an Immutable Action"
-            echo "is-action-release=false" >> $GITHUB_OUTPUT
-          fi
-      - name: Checking out
-        if: steps.check.outputs.is-action-release == 'true'
-        uses: actions/checkout@v4
-      - name: Publish
-        if: steps.check.outputs.is-action-release == 'true'
-        id: publish
-        uses: actions/publish-immutable-action@v0.0.4

.github/workflows/python-deps.yml

@@ -0,0 +1,174 @@
+name: Test Python Package Installation
+
+on:
+  push:
+    branches: [main, releases/v2]
+  pull_request:
+    # Run checks on reopened draft PRs to support triggering PR checks on draft PRs that were opened
+    # by other workflows.
+    types: [opened, synchronize, reopened, ready_for_review]
+    paths:
+      # Changes to this workflow.
+      - '.github/workflows/python-deps.yml'
+      # Changes to the Python package installation scripts and their tests.
+      - 'python-setup/**'
+      # Changes to the default CodeQL bundle version.
+      - '**/defaults.json'
+  schedule:
+    # Weekly on Monday.
+    - cron: '0 0 * * 1'
+  workflow_dispatch:
+
+jobs:
+  test-setup-python-scripts:
+    timeout-minutes: 45
+    runs-on: ${{ matrix.os }}
+    strategy:
+        fail-fast: false
+        matrix:
+          os: [ubuntu-20.04, ubuntu-22.04, macos-latest]
+          python_deps_type: [pipenv, poetry, requirements, setup_py]
+          python_version: [3]
+
+
+    env:
+      PYTHON_DEPS_TYPE: ${{ matrix.python_deps_type }}
+      PYTHON_VERSION: ${{ matrix.python_version }}
+
+    steps:
+    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+    - uses: actions/checkout@v4
+
+    - name: Initialize CodeQL
+      uses: ./init
+      id: init
+      with:
+        tools: latest
+        languages: python
+        setup-python-dependencies: false
+
+    - name: Test Auto Package Installation
+      run: |
+        set -x
+        $GITHUB_WORKSPACE/python-setup/install_tools.sh
+
+        cd $GITHUB_WORKSPACE/python-setup/tests/${PYTHON_DEPS_TYPE}/requests-${PYTHON_VERSION}
+
+        case ${{ matrix.os }} in
+            ubuntu-20.04*)     basePath="/opt";;
+            ubuntu-22.04*)     basePath="/opt";;
+            macos-latest*)    basePath="/Users/runner";;
+        esac
+        echo ${basePath}
+
+        $GITHUB_WORKSPACE/python-setup/auto_install_packages.py "$(dirname ${{steps.init.outputs.codeql-path}})"
+    - name: Setup for extractor
+      run: |
+        echo $CODEQL_PYTHON
+        # only run if $CODEQL_PYTHON is set
+        if [ ! -z $CODEQL_PYTHON ]; then
+            $GITHUB_WORKSPACE/python-setup/tests/from_python_exe.py $CODEQL_PYTHON;
+        fi
+
+    - name: Verify packages installed
+      run: |
+        $GITHUB_WORKSPACE/python-setup/tests/check_requests.sh ${PYTHON_VERSION} 2.31.0
+
+  # This one shouldn't fail, but also won't install packages
+  test-setup-python-scripts-non-standard-location:
+    runs-on: ${{ matrix.os }}
+    strategy:
+        fail-fast: false
+        matrix:
+          os: [ubuntu-20.04, ubuntu-22.04, macos-latest]
+
+    steps:
+    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+    - uses: actions/checkout@v4
+
+    - name: Initialize CodeQL
+      uses: ./init
+      id: init
+      with:
+        tools: latest
+        languages: python
+        setup-python-dependencies: false
+
+    - name: Test Auto Package Installation
+      run: |
+        set -x
+        $GITHUB_WORKSPACE/python-setup/install_tools.sh
+
+        cd $GITHUB_WORKSPACE/python-setup/tests/requirements/non-standard-location
+
+        case ${{ matrix.os }} in
+            ubuntu-20.04*)     basePath="/opt";;
+            ubuntu-22.04*)     basePath="/opt";;
+            macos-latest*)    basePath="/Users/runner";;
+        esac
+        echo ${basePath}
+
+        $GITHUB_WORKSPACE/python-setup/auto_install_packages.py "$(dirname ${{steps.init.outputs.codeql-path}})"
+
+    - name: Setup for extractor
+      run: |
+        echo $CODEQL_PYTHON
+        # only run if $CODEQL_PYTHON is set
+        if [ ! -z $CODEQL_PYTHON ]; then
+            $GITHUB_WORKSPACE/python-setup/tests/from_python_exe.py $CODEQL_PYTHON;
+        fi
+
+    - name: Verify packages installed
+      run: |
+        test -z $LGTM_INDEX_IMPORT_PATH
+
+  test-setup-python-scripts-windows:
+    runs-on: windows-latest
+    strategy:
+        fail-fast: false
+        matrix:
+          python_deps_type: [pipenv, poetry, requirements, setup_py]
+          python_version: [3]
+
+    env:
+      CODEQL_ACTION_TEST_MODE: true
+      PYTHON_DEPS_TYPE: ${{ matrix.python_deps_type }}
+      PYTHON_VERSION: ${{ matrix.python_version }}
+
+    steps:
+    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+    - uses: actions/checkout@v4
+
+    - uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python_version }}
+
+    - name: Initialize CodeQL
+      id: init
+      uses: ./init
+      with:
+        tools: latest
+        languages: python
+        setup-python-dependencies: false
+
+    - name: Test Auto Package Installation
+      env:
+        CODEQL_PATH: ${{ steps.init.outputs.codeql-path }}
+      run: |
+        $cmd = $Env:GITHUB_WORKSPACE + "\\python-setup\\install_tools.ps1"
+        powershell -File $cmd
+
+        cd $Env:GITHUB_WORKSPACE\\python-setup/tests/$Env:PYTHON_DEPS_TYPE/requests-$Env:PYTHON_VERSION
+        $codeql_dist = (get-item $Env:CODEQL_PATH).Directory.FullName
+        py -3 $Env:GITHUB_WORKSPACE\\python-setup\\auto_install_packages.py $codeql_dist
+
+    - name: Setup for extractor
+      run: |
+        echo $Env:CODEQL_PYTHON
+
+        py -3 $Env:GITHUB_WORKSPACE\\python-setup\\tests\\from_python_exe.py $Env:CODEQL_PYTHON
+
+    - name: Verify packages installed
+      run: |
+        $cmd = $Env:GITHUB_WORKSPACE + "\\python-setup\\tests\\check_requests.ps1"
+        powershell -File $cmd $Env:PYTHON_VERSION 2.31.0

.github/workflows/python312-windows.yml

@@ -1,43 +0,0 @@
-name: Test that the workaround for python 3.12 on windows works
-
-on:
-  push:
-    branches: [main, releases/v*]
-  pull_request:
-    # Run checks on reopened draft PRs to support triggering PR checks on draft PRs that were opened
-    # by other workflows.
-    types: [opened, synchronize, reopened, ready_for_review]
-  schedule:
-    # Weekly on Monday.
-    - cron: '0 0 * * 1'
-  workflow_dispatch:
-
-jobs:
-  test-setup-python-scripts:
-    env:
-      CODEQL_ACTION_TEST_MODE: true
-    timeout-minutes: 45
-    permissions:
-      contents: read
-    runs-on: windows-latest
-
-    steps:
-    - uses: actions/setup-python@v5
-      with:
-        python-version: 3.12
-
-    - uses: actions/checkout@v4
-
-    - name: Prepare test
-      uses: ./.github/actions/prepare-test
-      with:
-        version: default
-
-    - name: Initialize CodeQL
-      uses: ./../action/init
-      with:
-        tools: linked
-        languages: python
-
-    - name: Analyze
-      uses: ./../action/analyze

.github/workflows/query-filters.yml

@@ -4,15 +4,13 @@ on:
   push:
     branches:
     - main
-    - releases/v*
+    - releases/v2
   pull_request:
     types:
     - opened
     - synchronize
     - reopened
     - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 
 jobs:
@@ -20,8 +18,6 @@ jobs:
     name: Query Filters Tests
     timeout-minutes: 45
     runs-on: ubuntu-latest
-    permissions:
-      contents: read # This permission is needed to allow the GitHub Actions workflow to read the contents of the repository.
     steps:
     - name: Check out repository
       uses: actions/checkout@v4
@@ -29,7 +25,7 @@ jobs:
       id: prepare-test
       uses: ./.github/actions/prepare-test
       with:
-        version: linked
+        version: latest
 
     - name: Check SARIF for default queries with Single include, Single exclude
       uses: ./../action/.github/actions/query-filter-test

.github/workflows/rebuild.yml

@@ -1,82 +0,0 @@
-name: Rebuild Action
-
-on:
-  pull_request:
-    types: [labeled]
-  workflow_dispatch:
-
-jobs:
-  rebuild:
-    name: Rebuild Action
-    runs-on: ubuntu-latest
-    if: github.event.label.name == 'Rebuild'
-
-    permissions:
-      contents: write # needed to push rebuilt commit
-      pull-requests: write # needed to comment on the PR
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.ref }}
-
-      - name: Remove label
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          PR_NUMBER: ${{ github.event.pull_request.number }}
-        run: |
-          gh pr edit --repo github/codeql-action "$PR_NUMBER" \
-            --remove-label "Rebuild"
-
-      - name: Merge in changes from base branch
-        env:
-          BASE_BRANCH: ${{ github.event.pull_request.base.ref }}
-        run: |
-          git fetch origin "$BASE_BRANCH"
-
-          # Allow merge conflicts in `lib`, since rebuilding should resolve them.
-          git merge "origin/$BASE_BRANCH" || echo "Merge conflicts detected"
-
-          # Check for merge conflicts outside of `lib`. Disable git diff's trailing whitespace check
-          # since `node_modules/@types/semver/README.md` fails it.
-          if git -c core.whitespace=-trailing-space diff --check | grep --invert-match '^lib/'; then
-            echo "Merge conflicts detected outside of lib/ directory. Please resolve them manually."
-            git -c core.whitespace=-trailing-space diff --check | grep --invert-match '^lib/' || true
-            exit 1
-          fi
-
-      - name: Compile TypeScript
-        run: |
-          npm install
-          npm run lint -- --fix
-          npm run build
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.11
-
-      - name: Generate workflows
-        run: |
-          cd pr-checks
-          python -m pip install --upgrade pip
-          pip install ruamel.yaml==0.17.31
-          python3 sync.py
-
-      - name: Check for changes and push
-        env:
-          BRANCH: ${{ github.event.pull_request.head.ref }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          PR_NUMBER: ${{ github.event.pull_request.number }}
-        run: |
-          if [ ! -z "$(git status --porcelain)" ]; then
-            git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
-            git config --global user.name "github-actions[bot]"
-            git add --all
-            git commit -m "Rebuild"
-            git push origin "HEAD:$BRANCH"
-            echo "Pushed a commit to rebuild the Action." \
-              "Please mark the PR as ready for review to trigger PR checks." |
-              gh pr comment --body-file - --repo github/codeql-action "$PR_NUMBER"
-            gh pr ready --undo --repo github/codeql-action "$PR_NUMBER"
-          fi

.github/workflows/script/check-js.sh

@@ -7,7 +7,7 @@ if [ ! -z "$(git status --porcelain)" ]; then
     >&2 echo "Failed: Repo should be clean before testing!"
     exit 1
 fi
-# Wipe the lib directory in case there are extra unnecessary files in there
+# Wipe the lib directory incase there are extra unnecessary files in there
 rm -rf lib
 # Generate the JavaScript files
 npm run-script build

.github/workflows/script/prepare_changelog.py

@@ -1,37 +0,0 @@
-import os
-import sys
-
-EMPTY_CHANGELOG = 'No changes.\n\n'
-
-# Prepare the changelog for the new release
-# This function will extract the part of the changelog that
-# we want to include in the new release.
-def extract_changelog_snippet(changelog_file, version_tag):
-  output = ''
-  if (not os.path.exists(changelog_file)):
-    output = EMPTY_CHANGELOG
-
-  else:
-    with open('CHANGELOG.md', 'r') as f:
-      lines = f.readlines()
-
-      # Include everything up to, but excluding the second heading
-      found_first_section = False
-      for i, line in enumerate(lines):
-        if line.startswith('## '):
-          if found_first_section:
-            break
-          found_first_section = True
-        output += line
-
-  output += f"See the full [CHANGELOG.md](https://github.com/github/codeql-action/blob/{version_tag}/CHANGELOG.md) for more information."
-
-  return output
-
-
-if len(sys.argv) < 3:
-  raise Exception('Expecting argument: changelog_file version_tag')
-changelog_file = sys.argv[1]
-version_tag = sys.argv[2]
-
-print(extract_changelog_snippet(changelog_file, version_tag))

.github/workflows/script/update-node-modules.sh

@@ -1,12 +1,9 @@
-#!/bin/bash
+if [ "$1" != "update" && "$1" != "check-only" ]; then
-set -eu
-
-if [ "$1" != "update" ] && [ "$1" != "check-only" ]; then
     >&2 echo "Failed: Invalid argument. Must be 'update' or 'check-only'"
     exit 1
 fi
 
-npm install --force -g npm@9.2.0
+sudo npm install --force -g npm@9.2.0
 
 # clean the npm cache to ensure we don't have any files owned by root
 sudo npm cache clean --force

.github/workflows/script/update-required-checks.sh

@@ -2,11 +2,6 @@
 # Update the required checks based on the current branch.
 # Typically, this will be main.
 
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-REPO_DIR="$(dirname "$SCRIPT_DIR")"
-GRANDPARENT_DIR="$(dirname "$REPO_DIR")"
-source "$GRANDPARENT_DIR/releases.ini"
-
 if ! gh auth status 2>/dev/null; then
   gh auth status
   echo "Failed: Not authorized. This script requires admin access to github/codeql-action through the gh CLI."
@@ -27,29 +22,14 @@ fi
 
 echo "Getting checks for $GITHUB_SHA"
 
-# Ignore any checks with "https://", CodeQL, LGTM, Update, and ESLint checks.
+# Ignore any checks with "https://", CodeQL, LGTM, and Update checks.
-CHECKS="$(gh api repos/github/codeql-action/commits/"${GITHUB_SHA}"/check-runs --paginate | jq --slurp --compact-output --raw-output '[.[].check_runs.[] | select(.conclusion != "skipped") | .name | select(contains("https://") or . == "CodeQL" or . == "Dependabot" or . == "check-expected-release-files" or contains("Update") or contains("ESLint") or contains("update") or contains("test-setup-python-scripts") | not)] | unique | sort')"
+CHECKS="$(gh api repos/github/codeql-action/commits/"${GITHUB_SHA}"/check-runs --paginate | jq --slurp --compact-output --raw-output '[.[].check_runs | .[].name | select(contains("https://") or . == "CodeQL" or . == "LGTM.com" or . == "check-expected-release-files" or contains("Update") or contains("update") or contains("test-setup-python-scripts") | not)] | unique | sort')"
 
 echo "$CHECKS" | jq
 
 echo "{\"contexts\": ${CHECKS}}" > checks.json
 
-echo "Updating main"
+for BRANCH in main releases/v2; do
-gh api --silent -X "PATCH" "repos/github/codeql-action/branches/main/protection/required_status_checks" --input checks.json
-
-# list all branchs on origin remote matching releases/v*
-BRANCHES="$(git ls-remote --heads origin 'releases/v*' | sed 's?.*refs/heads/??' | sort -V)"
-
-for BRANCH in $BRANCHES; do
-
-  # strip exact 'releases/v' prefix from $BRANCH using count of characters
-  VERSION="${BRANCH:10}"
-
-  if [ "$VERSION" -lt "$OLDEST_SUPPORTED_MAJOR_VERSION" ]; then
-    echo "Skipping $BRANCH"
-    continue
-  fi
-
   echo "Updating $BRANCH"
   gh api --silent -X "PATCH" "repos/github/codeql-action/branches/$BRANCH/protection/required_status_checks" --input checks.json
 done

.github/workflows/test-codeql-bundle-all.yml

@@ -2,24 +2,24 @@ name: 'PR Check - CodeQL Bundle All'
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GO111MODULE: auto
+  # Disable Kotlin analysis while it's incompatible with Kotlin 1.8, until we find a
+  # workaround for our PR checks.
+  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
 on:
   push:
     branches:
     - main
-    - releases/v*
+    - releases/v2
   pull_request:
     types:
     - opened
     - synchronize
     - reopened
     - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   test-codeql-bundle-all:
     strategy:
-      fail-fast: false
       matrix:
         include:
         - os: ubuntu-latest
@@ -27,7 +27,7 @@ jobs:
     name: 'CodeQL Bundle All'
     permissions:
       contents: read
-      security-events: read
+      security-events: write
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
@@ -42,12 +42,15 @@ jobs:
     - id: init
       uses: ./../action/init
       with:
-        # We manually exclude Swift from the languages list here, as it is not supported on Ubuntu
-        languages: cpp,csharp,go,java,javascript,python,ruby 
         tools: ${{ steps.prepare-test.outputs.tools-url }}
+    - uses: ./../action/.github/actions/setup-swift
+      with:
+        codeql-path: ${{ steps.init.outputs.codeql-path }}
     - name: Build code
       shell: bash
       run: ./build.sh
     - uses: ./../action/analyze
+      with:
+        upload-database: false
     env:
-      CODEQL_ACTION_TEST_MODE: true
+      CODEQL_ACTION_TEST_MODE: true

.github/workflows/update-bundle.yml

@@ -17,9 +17,6 @@ jobs:
   update-bundle:
     if: github.event.release.prerelease && startsWith(github.event.release.tag_name, 'codeql-bundle-')
     runs-on: ubuntu-latest
-    permissions:
-      contents: write # needed to push commits
-      pull-requests: write # needed to create pull requests
     steps:
       - name: Dump environment
         run: env
@@ -57,7 +54,7 @@ jobs:
           cli_version=$(jq -r '.cliVersion' src/defaults.json)
           pr_url=$(gh pr create \
             --title "Update default bundle to $cli_version" \
-            --body "This pull request updates the default CodeQL bundle, as used with \`tools: linked\` and on GHES, to $cli_version." \
+            --body "This pull request updates the default CodeQL bundle, as used with \`tools: latest\` and on GHES, to $cli_version." \
             --assignee "$GITHUB_ACTOR" \
             --draft \
           )

.github/workflows/update-dependencies.yml

@@ -9,9 +9,6 @@ jobs:
     timeout-minutes: 45
     runs-on: macos-latest
     if: contains(github.event.pull_request.labels.*.name, 'Update dependencies') && (github.event.pull_request.head.repo.full_name == 'github/codeql-action')
-    permissions:
-      contents: write # needed to push the updated dependencies
-      pull-requests: write # needed to comment on the PR
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4

.github/workflows/update-release-branch.yml

@@ -1,149 +1,46 @@
 name: Update release branch
 on:
   # You can trigger this workflow via workflow dispatch to start a release.
-  # This will open a PR to update the latest release branch.
+  # This will open a PR to update the v2 release branch.
   workflow_dispatch:
 
-  # When a release is complete this workflow will open up backport PRs to older release branches.
-  # NB while it will trigger on any release branch update, the backport job will not proceed for
-  # anything other than than releases/v{latest}
-  push:
-    branches:
-      - releases/*
-
 jobs:
-
-  prepare:
-    runs-on: ubuntu-latest
-    if: github.repository == 'github/codeql-action'
-    outputs:
-      version: ${{ steps.versions.outputs.version }}
-      major_version: ${{ steps.versions.outputs.major_version }}
-      latest_tag: ${{ steps.versions.outputs.latest_tag }}
-      backport_source_branch: ${{ steps.branches.outputs.backport_source_branch }}
-      backport_target_branches: ${{ steps.branches.outputs.backport_target_branches }}
-    permissions:
-      contents: read
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0  # Need full history for calculation of diffs
-    - uses: ./.github/actions/release-initialise
-
-    - name: Get version tags
-      id: versions
-      run: |
-        VERSION="v$(jq '.version' -r 'package.json')"
-        echo "version=${VERSION}" >> $GITHUB_OUTPUT
-        MAJOR_VERSION=$(cut -d '.' -f1 <<< "${VERSION}")
-        echo "major_version=${MAJOR_VERSION}" >> $GITHUB_OUTPUT
-        LATEST_TAG=$(git tag --sort=-v:refname | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+' | head -1)
-        echo "latest_tag=${LATEST_TAG}" >> $GITHUB_OUTPUT
-
-    - id: branches
-      name: Determine older release branches
-      uses: ./.github/actions/release-branches
-      with:
-        major_version: ${{ steps.versions.outputs.major_version }}
-        latest_tag: ${{ steps.versions.outputs.latest_tag }}
-
-    - name: debug logging
-      run: |
-        echo 'version: ${{ steps.versions.outputs.version }}'
-        echo 'major_version: ${{ steps.versions.outputs.major_version }}'
-        echo 'latest_tag: ${{ steps.versions.outputs.latest_tag }}'
-        echo 'backport_source_branch: ${{ steps.branches.outputs.backport_source_branch }}'
-        echo 'backport_target_branches: ${{ steps.branches.outputs.backport_target_branches }}'
-
   update:
     timeout-minutes: 45
     runs-on: ubuntu-latest
-    if: github.event_name == 'workflow_dispatch'
+    if: github.repository == 'github/codeql-action'
-    needs: [prepare]
-    env:
-      REF_NAME: "${{ github.ref_name }}"
-      REPOSITORY: "${{ github.repository }}"
-      MAJOR_VERSION: "${{ needs.prepare.outputs.major_version }}"
-      LATEST_TAG: "${{ needs.prepare.outputs.latest_tag }}"
-    permissions:
-      contents: write # needed to push commits
-      pull-requests: write # needed to create pull request
     steps:
+    - name: Dump environment
+      run: env
+
+    - name: Dump GitHub context
+      env:
+        GITHUB_CONTEXT: '${{ toJson(github) }}'
+      run: echo "$GITHUB_CONTEXT"
+
     - uses: actions/checkout@v4
       with:
-        fetch-depth: 0  # Need full history for calculation of diffs
+        # Need full history so we calculate diffs
-    - uses: ./.github/actions/release-initialise
+        fetch-depth: 0
 
-    # when the workflow has been manually triggered on main,
+    - name: Set up Python
-    # we know that we definitely want the release branch to exist
+      uses: actions/setup-python@v4
-    - name: Ensure release branch exists
+      with:
-      run: |
+        python-version: 3.8
-        echo "MAJOR_VERSION ${MAJOR_VERSION}"
-        RELEASE_BRANCH=releases/${MAJOR_VERSION}
-        if git checkout $RELEASE_BRANCH > /dev/null 2>&1; then
-            echo "Branch $RELEASE_BRANCH already exists"
-            echo ""
-        else
-            echo "Creating $RELEASE_BRANCH branch"
-            git checkout -b ${RELEASE_BRANCH} ${LATEST_TAG}
-            git push --set-upstream origin ${RELEASE_BRANCH}
-            git branch --show-current
-            echo ""
-        fi
-        echo "Returning to branch: ${REF_NAME}"
-        git checkout ${REF_NAME}
 
-    - name: Update current release branch
+    - name: Install dependencies
-      if: github.event_name == 'workflow_dispatch'
+      run: |
+        python -m pip install --upgrade pip
+        pip install PyGithub==1.55 requests
+
+    - name: Update git config
+      run: |
+        git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+        git config --global user.name "github-actions[bot]"
+
+    - name: Update release branch
       run: |
-        echo SOURCE_BRANCH=${REF_NAME}
-        echo TARGET_BRANCH=releases/${MAJOR_VERSION}
         python .github/update-release-branch.py \
           --github-token ${{ secrets.GITHUB_TOKEN }} \
           --repository-nwo ${{ github.repository }} \
-          --source-branch '${{ env.REF_NAME }}' \
-          --target-branch 'releases/${{ env.MAJOR_VERSION }}' \
-          --is-primary-release \
-          --conductor ${GITHUB_ACTOR}
-
-  backport:
-    timeout-minutes: 45
-    runs-on: ubuntu-latest
-    environment: Automation
-    needs: [prepare]
-    if: ${{ (github.event_name == 'push') && needs.prepare.outputs.backport_target_branches != '[]' }}
-    strategy:
-      fail-fast: false
-      matrix:
-        target_branch: ${{ fromJson(needs.prepare.outputs.backport_target_branches) }}
-    env:
-      SOURCE_BRANCH: ${{ needs.prepare.outputs.backport_source_branch }}
-      TARGET_BRANCH: ${{ matrix.target_branch }}
-    permissions:
-      contents: write # needed to push commits
-      pull-requests: write # needed to create pull request
-    steps:
-    - name: Generate token
-      uses: actions/create-github-app-token@v2.0.2
-      id: app-token
-      with:
-        app-id: ${{ vars.AUTOMATION_APP_ID }}
-        private-key: ${{ secrets.AUTOMATION_PRIVATE_KEY }}
-
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0  # Need full history for calculation of diffs
-        token: ${{ steps.app-token.outputs.token }}
-    - uses: ./.github/actions/release-initialise
-
-    - name: Update older release branch
-      run: |
-        echo SOURCE_BRANCH=${SOURCE_BRANCH}
-        echo TARGET_BRANCH=${TARGET_BRANCH}
-        python .github/update-release-branch.py \
-          --github-token ${{ secrets.GITHUB_TOKEN }} \
-          --repository-nwo ${{ github.repository }} \
-          --source-branch ${SOURCE_BRANCH} \
-          --target-branch ${TARGET_BRANCH} \
           --conductor ${GITHUB_ACTOR}

.github/workflows/update-supported-enterprise-server-versions.yml

@@ -10,23 +10,20 @@ jobs:
     name: Update Supported Enterprise Server Versions
     timeout-minutes: 45
     runs-on: ubuntu-latest
-    if: github.repository == 'github/codeql-action'
+    if: ${{ github.repository == 'github/codeql-action' }}
-    permissions:
-      contents: write # needed to push commits
-      pull-requests: write # needed to create pull request
 
     steps:
       - name: Setup Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v4
         with:
-          python-version: "3.13"
+          python-version: "3.7"
       - name: Checkout CodeQL Action
         uses: actions/checkout@v4
       - name: Checkout Enterprise Releases
         uses: actions/checkout@v4
         with:
           repository: github/enterprise-releases
-          token: ${{ secrets.ENTERPRISE_RELEASE_TOKEN }}
+          ssh-key: ${{ secrets.ENTERPRISE_RELEASES_SSH_KEY }}
           path: ${{ github.workspace }}/enterprise-releases/
       - name: Update Supported Enterprise Server Versions
         run: |
@@ -57,8 +54,7 @@ jobs:
             git push origin update-supported-enterprise-server-versions
 
             body="This PR updates the list of supported GitHub Enterprise Server versions, either because a new "
-            body+="version is about to be feature frozen, or because an old release has been deprecated."
+            body+="version is about to be feature frozen, or because an old release has been deprecated.\n\n"
-            body+=$'\n\n'
             body+="If an old release has been deprecated, please follow the instructions in CONTRIBUTING.md to "
             body+="deprecate the corresponding version of CodeQL."
 

.gitignore

@@ -1,11 +1,2 @@
 # Ignore for example failing-tests.json from AVA
-node_modules/.cache/
+node_modules/.cache
-# Java build files
-.gradle/
-*.class
-# macOS
-.DS_Store
-# eslint sarif report
-eslint.sarif
-# for local incremental compilation
-tsconfig.tsbuildinfo

.pre-commit-config.yaml

@@ -1,20 +0,0 @@
-repos:
-  - repo: local
-    hooks:
-      - id: lint-ts
-        name: Lint typescript code
-        files: \.ts$
-        language: system
-        entry: npm run lint -- --fix
-      - id: compile-ts
-        name: Compile typescript
-        files: \.[tj]s$
-        language: system
-        entry: npm run build
-        pass_filenames: false
-      - id: pr-checks-sync
-        name: Synchronize PR check workflows
-        files: ^.github/workflows/__.*\.yml$|^pr-checks
-        language: system
-        entry: pr-checks/sync.sh
-        pass_filenames: false

.vscode/settings.json

@@ -12,8 +12,5 @@
   "git.ignoreLimitWarning": true,
   // Use the vendored TypeScript version to have a consistent development experience across
   // machines.
-  "typescript.tsdk": "node_modules/typescript/lib",
+  "typescript.tsdk": "node_modules/typescript/lib"
-  "[typescript]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
 }

CHANGELOG.md

@@ -6,394 +6,6 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th
 
 No user facing changes.
 
-## 3.28.16 - 23 Apr 2025
-
-- Update default CodeQL bundle version to 2.21.1. [#2863](https://github.com/github/codeql-action/pull/2863)
-
-## 3.28.15 - 07 Apr 2025
-
-- Fix bug where the action would fail if it tried to produce a debug artifact with more than 65535 files. [#2842](https://github.com/github/codeql-action/pull/2842)
-
-## 3.28.14 - 07 Apr 2025
-
-- Update default CodeQL bundle version to 2.21.0. [#2838](https://github.com/github/codeql-action/pull/2838)
-
-## 3.28.13 - 24 Mar 2025
-
-No user facing changes.
-
-## 3.28.12 - 19 Mar 2025
-
-- Dependency caching should now cache more dependencies for Java `build-mode: none` extractions. This should speed up workflows and avoid inconsistent alerts in some cases.
-- Update default CodeQL bundle version to 2.20.7. [#2810](https://github.com/github/codeql-action/pull/2810)
-
-## 3.28.11 - 07 Mar 2025
-
-- Update default CodeQL bundle version to 2.20.6. [#2793](https://github.com/github/codeql-action/pull/2793)
-
-## 3.28.10 - 21 Feb 2025
-
-- Update default CodeQL bundle version to 2.20.5. [#2772](https://github.com/github/codeql-action/pull/2772)
-- Address an issue where the CodeQL Bundle would occasionally fail to decompress on macOS. [#2768](https://github.com/github/codeql-action/pull/2768)
-
-## 3.28.9 - 07 Feb 2025
-
-- Update default CodeQL bundle version to 2.20.4. [#2753](https://github.com/github/codeql-action/pull/2753)
-
-## 3.28.8 - 29 Jan 2025
-
-- Enable support for Kotlin 2.1.10 when running with CodeQL CLI v2.20.3. [#2744](https://github.com/github/codeql-action/pull/2744)
-
-## 3.28.7 - 29 Jan 2025
-
-No user facing changes.
-
-## 3.28.6 - 27 Jan 2025
-
-- Re-enable debug artifact upload for CLI versions 2.20.3 or greater. [#2726](https://github.com/github/codeql-action/pull/2726)
-
-## 3.28.5 - 24 Jan 2025
-
-- Update default CodeQL bundle version to 2.20.3. [#2717](https://github.com/github/codeql-action/pull/2717)
-
-## 3.28.4 - 23 Jan 2025
-
-No user facing changes.
-
-## 3.28.3 - 22 Jan 2025
-
-- Update default CodeQL bundle version to 2.20.2. [#2707](https://github.com/github/codeql-action/pull/2707)
-- Fix an issue downloading the CodeQL Bundle from a GitHub Enterprise Server instance which occurred when the CodeQL Bundle had been synced to the instance using the [CodeQL Action sync tool](https://github.com/github/codeql-action-sync-tool) and the Actions runner did not have Zstandard installed. [#2710](https://github.com/github/codeql-action/pull/2710)
-- Uploading debug artifacts for CodeQL analysis is temporarily disabled. [#2712](https://github.com/github/codeql-action/pull/2712)
-
-## 3.28.2 - 21 Jan 2025
-
-No user facing changes.
-
-## 3.28.1 - 10 Jan 2025
-
-- CodeQL Action v2 is now deprecated, and is no longer updated or supported. For better performance, improved security, and new features, upgrade to v3. For more information, see [this changelog post](https://github.blog/changelog/2025-01-10-code-scanning-codeql-action-v2-is-now-deprecated/). [#2677](https://github.com/github/codeql-action/pull/2677)
-- Update default CodeQL bundle version to 2.20.1. [#2678](https://github.com/github/codeql-action/pull/2678)
-
-## 3.28.0 - 20 Dec 2024
-
-- Bump the minimum CodeQL bundle version to 2.15.5. [#2655](https://github.com/github/codeql-action/pull/2655)
-- Don't fail in the unusual case that a file is on the search path. [#2660](https://github.com/github/codeql-action/pull/2660).
-
-## 3.27.9 - 12 Dec 2024
-
-No user facing changes.
-
-## 3.27.8 - 12 Dec 2024
-
-- Fixed an issue where streaming the download and extraction of the CodeQL bundle did not respect proxy settings. [#2624](https://github.com/github/codeql-action/pull/2624)
-
-## 3.27.7 - 10 Dec 2024
-
-- We are rolling out a change in December 2024 that will extract the CodeQL bundle directly to the toolcache to improve performance. [#2631](https://github.com/github/codeql-action/pull/2631)
-- Update default CodeQL bundle version to 2.20.0. [#2636](https://github.com/github/codeql-action/pull/2636)
-
-## 3.27.6 - 03 Dec 2024
-
-- Update default CodeQL bundle version to 2.19.4. [#2626](https://github.com/github/codeql-action/pull/2626)
-
-## 3.27.5 - 19 Nov 2024
-
-No user facing changes.
-
-## 3.27.4 - 14 Nov 2024
-
-No user facing changes.
-
-## 3.27.3 - 12 Nov 2024
-
-No user facing changes.
-
-## 3.27.2 - 12 Nov 2024
-
-- Fixed an issue where setting up the CodeQL tools would sometimes fail with the message "Invalid value 'undefined' for header 'authorization'". [#2590](https://github.com/github/codeql-action/pull/2590)
-
-## 3.27.1 - 08 Nov 2024
-
-- The CodeQL Action now downloads bundles compressed using Zstandard on GitHub Enterprise Server when using Linux or macOS runners. This speeds up the installation of the CodeQL tools. This feature is already available to GitHub.com users. [#2573](https://github.com/github/codeql-action/pull/2573)
-- Update default CodeQL bundle version to 2.19.3. [#2576](https://github.com/github/codeql-action/pull/2576)
-
-## 3.27.0 - 22 Oct 2024
-
-- Bump the minimum CodeQL bundle version to 2.14.6. [#2549](https://github.com/github/codeql-action/pull/2549)
-- Fix an issue where the `upload-sarif` Action would fail with "upload-sarif post-action step failed: Input required and not supplied: token" when called in a composite Action that had a different set of inputs to the ones expected by the `upload-sarif` Action. [#2557](https://github.com/github/codeql-action/pull/2557)
-- Update default CodeQL bundle version to 2.19.2. [#2552](https://github.com/github/codeql-action/pull/2552)
-
-## 3.26.13 - 14 Oct 2024
-
-No user facing changes.
-
-## 3.26.12 - 07 Oct 2024
-
-- _Upcoming breaking change_: Add a deprecation warning for customers using CodeQL version 2.14.5 and earlier. These versions of CodeQL were discontinued on 24 September 2024 alongside GitHub Enterprise Server 3.10, and will be unsupported by CodeQL Action versions 3.27.0 and later and versions 2.27.0 and later. [#2520](https://github.com/github/codeql-action/pull/2520)
-
-  - If you are using one of these versions, please update to CodeQL CLI version 2.14.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.13.5 and 2.14.5, you can replace `github/codeql-action/*@v3` by `github/codeql-action/*@v3.26.11` and `github/codeql-action/*@v2` by `github/codeql-action/*@v2.26.11` in your code scanning workflow to ensure you continue using this version of the CodeQL Action.
-
-## 3.26.11 - 03 Oct 2024
-
-- _Upcoming breaking change_: Add support for using `actions/download-artifact@v4` to programmatically consume CodeQL Action debug artifacts.
-
-  Starting November 30, 2024, GitHub.com customers will [no longer be able to use `actions/download-artifact@v3`](https://github.blog/changelog/2024-04-16-deprecation-notice-v3-of-the-artifact-actions/). Therefore, to avoid breakage, customers who programmatically download the CodeQL Action debug artifacts should set the `CODEQL_ACTION_ARTIFACT_V4_UPGRADE` environment variable to `true` and bump `actions/download-artifact@v3` to `actions/download-artifact@v4` in their workflows. The CodeQL Action will enable this behavior by default in early November and workflows that have not yet bumped `actions/download-artifact@v3` to `actions/download-artifact@v4` will begin failing then.
-
-  This change is currently unavailable for GitHub Enterprise Server customers, as `actions/upload-artifact@v4` and `actions/download-artifact@v4` are not yet compatible with GHES.
-- Update default CodeQL bundle version to 2.19.1. [#2519](https://github.com/github/codeql-action/pull/2519)
-
-## 3.26.10 - 30 Sep 2024
-
-- We are rolling out a feature in September/October 2024 that sets up CodeQL using a bundle compressed with [Zstandard](http://facebook.github.io/zstd/). Our aim is to improve the performance of setting up CodeQL. [#2502](https://github.com/github/codeql-action/pull/2502)
-
-## 3.26.9 - 24 Sep 2024
-
-No user facing changes.
-
-## 3.26.8 - 19 Sep 2024
-
-- Update default CodeQL bundle version to 2.19.0. [#2483](https://github.com/github/codeql-action/pull/2483)
-
-## 3.26.7 - 13 Sep 2024
-
-- Update default CodeQL bundle version to 2.18.4. [#2471](https://github.com/github/codeql-action/pull/2471)
-
-## 3.26.6 - 29 Aug 2024
-
-- Update default CodeQL bundle version to 2.18.3. [#2449](https://github.com/github/codeql-action/pull/2449)
-
-## 3.26.5 - 23 Aug 2024
-
-- Fix an issue where the `csrutil` system call used for telemetry would fail on macOS ARM machines with System Integrity Protection disabled. [#2441](https://github.com/github/codeql-action/pull/2441)
-
-## 3.26.4 - 21 Aug 2024
-
-- _Deprecation:_ The `add-snippets` input on the `analyze` Action is deprecated and will be removed in the first release in August 2025. [#2436](https://github.com/github/codeql-action/pull/2436)
-- Fix an issue where the disk usage system call used for telemetry would fail on macOS ARM machines with System Integrity Protection disabled, and then surface a warning. The system call is now disabled for these machines. [#2434](https://github.com/github/codeql-action/pull/2434)
-
-## 3.26.3 - 19 Aug 2024
-
-- Fix an issue where the CodeQL Action could not write diagnostic messages on Windows. This issue did not impact analysis quality. [#2430](https://github.com/github/codeql-action/pull/2430)
-
-## 3.26.2 - 14 Aug 2024
-
-- Update default CodeQL bundle version to 2.18.2. [#2417](https://github.com/github/codeql-action/pull/2417)
-
-## 3.26.1 - 13 Aug 2024
-
-No user facing changes.
-
-## 3.26.0 - 06 Aug 2024
-
-- _Deprecation:_ Swift analysis on Ubuntu runner images is no longer supported. Please migrate to a macOS runner if this affects you. [#2403](https://github.com/github/codeql-action/pull/2403)
-- Bump the minimum CodeQL bundle version to 2.13.5. [#2408](https://github.com/github/codeql-action/pull/2408)
-
-## 3.25.15 - 26 Jul 2024
-
-- Update default CodeQL bundle version to 2.18.1. [#2385](https://github.com/github/codeql-action/pull/2385)
-
-## 3.25.14 - 25 Jul 2024
-
-- Experimental: add a new `start-proxy` action which starts the same HTTP proxy as used by [`github/dependabot-action`](https://github.com/github/dependabot-action). Do not use this in production as it is part of an internal experiment and subject to change at any time. [#2376](https://github.com/github/codeql-action/pull/2376)
-
-## 3.25.13 - 19 Jul 2024
-
-- Add `codeql-version` to outputs. [#2368](https://github.com/github/codeql-action/pull/2368)
-- Add a deprecation warning for customers using CodeQL version 2.13.4 and earlier. These versions of CodeQL were discontinued on 9 July 2024 alongside GitHub Enterprise Server 3.9, and will be unsupported by CodeQL Action versions 3.26.0 and later and versions 2.26.0 and later. [#2375](https://github.com/github/codeql-action/pull/2375)
-  - If you are using one of these versions, please update to CodeQL CLI version 2.13.5 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.12.6 and 2.13.4, you can replace `github/codeql-action/*@v3` by `github/codeql-action/*@v3.25.13` and `github/codeql-action/*@v2` by `github/codeql-action/*@v2.25.13` in your code scanning workflow to ensure you continue using this version of the CodeQL Action.
-
-## 3.25.12 - 12 Jul 2024
-
-- Improve 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) on GitHub Enterprise Server. This feature is already available to GitHub.com users. [#2353](https://github.com/github/codeql-action/pull/2353)
-- Update default CodeQL bundle version to 2.18.0. [#2364](https://github.com/github/codeql-action/pull/2364)
-
-## 3.25.11 - 28 Jun 2024
-
-- Avoid failing the workflow run if there is an error while uploading debug artifacts. [#2349](https://github.com/github/codeql-action/pull/2349)
-- Update default CodeQL bundle version to 2.17.6. [#2352](https://github.com/github/codeql-action/pull/2352)
-
-## 3.25.10 - 13 Jun 2024
-
-- Update default CodeQL bundle version to 2.17.5. [#2327](https://github.com/github/codeql-action/pull/2327)
-
-## 3.25.9 - 12 Jun 2024
-
-- Avoid failing database creation if the database folder already exists and contains some unexpected files. Requires CodeQL 2.18.0 or higher. [#2330](https://github.com/github/codeql-action/pull/2330)
-- The init Action will attempt to clean up the database cluster directory before creating a new database and at the end of the job. This will help to avoid issues where the database cluster directory is left in an inconsistent state. [#2332](https://github.com/github/codeql-action/pull/2332)
-
-## 3.25.8 - 04 Jun 2024
-
-- Update default CodeQL bundle version to 2.17.4. [#2321](https://github.com/github/codeql-action/pull/2321)
-
-## 3.25.7 - 31 May 2024
-
-- We are rolling out a feature in May/June 2024 that will reduce the Actions cache usage of the Action by keeping only the newest TRAP cache for each language. [#2306](https://github.com/github/codeql-action/pull/2306)
-
-## 3.25.6 - 20 May 2024
-
-- Update default CodeQL bundle version to 2.17.3. [#2295](https://github.com/github/codeql-action/pull/2295)
-
-## 3.25.5 - 13 May 2024
-
-- Add a compatibility matrix of supported CodeQL Action, CodeQL CLI, and GitHub Enterprise Server versions to the [README.md](README.md). [#2273](https://github.com/github/codeql-action/pull/2273)
-- Avoid printing out a warning for a missing `on.push` trigger when the CodeQL Action is triggered via a `workflow_call` event. [#2274](https://github.com/github/codeql-action/pull/2274)
-- The `tools: latest` input to the `init` Action has been renamed to `tools: linked`. This option specifies that the Action should use the tools shipped at the same time as the Action. The old name will continue to work for backwards compatibility, but we recommend that new workflows use the new name. [#2281](https://github.com/github/codeql-action/pull/2281)
-
-## 3.25.4 - 08 May 2024
-
-- Update default CodeQL bundle version to 2.17.2. [#2270](https://github.com/github/codeql-action/pull/2270)
-
-## 3.25.3 - 25 Apr 2024
-
-- Update default CodeQL bundle version to 2.17.1. [#2247](https://github.com/github/codeql-action/pull/2247)
-- Workflows running on `macos-latest` using CodeQL CLI versions before v2.15.1 will need to either upgrade their CLI version to v2.15.1 or newer, or change the platform to an Intel macOS runner, such as `macos-12`. ARM machines with SIP disabled, including the newest `macos-latest` image, are unsupported for CLI versions before 2.15.1. [#2261](https://github.com/github/codeql-action/pull/2261)
-
-## 3.25.2 - 22 Apr 2024
-
-No user facing changes.
-
-## 3.25.1 - 17 Apr 2024
-
-- We are rolling out a feature in April/May 2024 that improves the reliability and performance of analyzing code when analyzing a compiled language with the `autobuild` [build mode](https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#codeql-build-modes). [#2235](https://github.com/github/codeql-action/pull/2235)
-- Fix a bug where the `init` Action would fail if `--overwrite` was specified in `CODEQL_ACTION_EXTRA_OPTIONS`. [#2245](https://github.com/github/codeql-action/pull/2245)
-
-## 3.25.0 - 15 Apr 2024
-
-- The deprecated feature for extracting dependencies for a Python analysis has been removed. [#2224](https://github.com/github/codeql-action/pull/2224)
-
-  As a result, the following inputs and environment variables are now ignored:
-
-  - The `setup-python-dependencies` input to the `init` Action
-  - The `CODEQL_ACTION_DISABLE_PYTHON_DEPENDENCY_INSTALLATION` environment variable
-
-  We recommend removing any references to these from your workflows. For more information, see the release notes for CodeQL Action v3.23.0 and v2.23.0.
-- Automatically overwrite an existing database if found on the filesystem. [#2229](https://github.com/github/codeql-action/pull/2229)
-- Bump the minimum CodeQL bundle version to 2.12.6. [#2232](https://github.com/github/codeql-action/pull/2232)
-- A more relevant log message and a diagnostic are now emitted when the `file` program is not installed on a Linux runner, but is required for Go tracing to succeed. [#2234](https://github.com/github/codeql-action/pull/2234)
-
-## 3.24.10 - 05 Apr 2024
-
-- Update default CodeQL bundle version to 2.17.0. [#2219](https://github.com/github/codeql-action/pull/2219)
-- Add a deprecation warning for customers using CodeQL version 2.12.5 and earlier. These versions of CodeQL were discontinued on 26 March 2024 alongside GitHub Enterprise Server 3.8, and will be unsupported by CodeQL Action versions 3.25.0 and later and versions 2.25.0 and later. [#2220](https://github.com/github/codeql-action/pull/2220)
-  - If you are using one of these versions, please update to CodeQL CLI version 2.12.6 or later. For instance, if you have specified a custom version of the CLI using the 'tools' input to the 'init' Action, you can remove this input to use the default version.
-  - Alternatively, if you want to continue using a version of the CodeQL CLI between 2.11.6 and 2.12.5, you can replace `github/codeql-action/*@v3` by `github/codeql-action/*@v3.24.10` and `github/codeql-action/*@v2` by `github/codeql-action/*@v2.24.10` in your code scanning workflow to ensure you continue using this version of the CodeQL Action.
-
-## 3.24.9 - 22 Mar 2024
-
-- Update default CodeQL bundle version to 2.16.5. [#2203](https://github.com/github/codeql-action/pull/2203)
-
-## 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)
-
-## 3.24.7 - 12 Mar 2024
-
-- Update default CodeQL bundle version to 2.16.4. [#2185](https://github.com/github/codeql-action/pull/2185)
-
-## 3.24.6 - 29 Feb 2024
-
-No user facing changes.
-
-## 3.24.5 - 23 Feb 2024
-
-- Update default CodeQL bundle version to 2.16.3. [#2156](https://github.com/github/codeql-action/pull/2156)
-
-## 3.24.4 - 21 Feb 2024
-
-- Fix an issue where an existing, but empty, `/sys/fs/cgroup/cpuset.cpus` file always resulted in a single-threaded run. [#2151](https://github.com/github/codeql-action/pull/2151)
-
-## 3.24.3 - 15 Feb 2024
-
-- Fix an issue where the CodeQL Action would fail to load a configuration specified by the `config` input to the `init` Action. [#2147](https://github.com/github/codeql-action/pull/2147)
-
-## 3.24.2 - 15 Feb 2024
-
-- Enable improved multi-threaded performance on larger runners for GitHub Enterprise Server users. This feature is already available to GitHub.com users. [#2141](https://github.com/github/codeql-action/pull/2141)
-
-## 3.24.1 - 13 Feb 2024
-
-- Update default CodeQL bundle version to 2.16.2. [#2124](https://github.com/github/codeql-action/pull/2124)
-- The CodeQL action no longer fails if it can't write to the telemetry api endpoint. [#2121](https://github.com/github/codeql-action/pull/2121)
-
-## 3.24.0 - 02 Feb 2024
-
-- CodeQL Python analysis will no longer install dependencies on GitHub Enterprise Server, as is already the case for GitHub.com. See [release notes for 3.23.0](#3230---08-jan-2024) for more details. [#2106](https://github.com/github/codeql-action/pull/2106)
-
-## 3.23.2 - 26 Jan 2024
-
-- On Linux, the maximum possible value for the `--threads` option now respects the CPU count as specified in `cgroup` files to more accurately reflect the number of available cores when running in containers. [#2083](https://github.com/github/codeql-action/pull/2083)
-- Update default CodeQL bundle version to 2.16.1. [#2096](https://github.com/github/codeql-action/pull/2096)
-
-## 3.23.1 - 17 Jan 2024
-
-- Update default CodeQL bundle version to 2.16.0. [#2073](https://github.com/github/codeql-action/pull/2073)
-- Change the retention period for uploaded debug artifacts to 7 days. Previously, this was whatever the repository default was. [#2079](https://github.com/github/codeql-action/pull/2079)
-
-## 3.23.0 - 08 Jan 2024
-
-- We are rolling out a feature in January 2024 that will disable Python dependency installation by default for all users. This improves the speed of analysis while having only a very minor impact on results. You can override this behavior by setting `CODEQL_ACTION_DISABLE_PYTHON_DEPENDENCY_INSTALLATION=false` in your workflow, however we plan to remove this ability in future versions of the CodeQL Action. [#2031](https://github.com/github/codeql-action/pull/2031)
-- The CodeQL Action now requires CodeQL version 2.11.6 or later. For more information, see [the corresponding changelog entry for CodeQL Action version 2.22.7](#2227---16-nov-2023). [#2009](https://github.com/github/codeql-action/pull/2009)
-
-## 3.22.12 - 22 Dec 2023
-
-- Update default CodeQL bundle version to 2.15.5. [#2047](https://github.com/github/codeql-action/pull/2047)
-
-## 3.22.11 - 13 Dec 2023
-
-- [v3+ only] The CodeQL Action now runs on Node.js v20. [#2006](https://github.com/github/codeql-action/pull/2006)
-
-## 2.22.10 - 12 Dec 2023
-
-- Update default CodeQL bundle version to 2.15.4. [#2016](https://github.com/github/codeql-action/pull/2016)
-
-## 2.22.9 - 07 Dec 2023
-
-No user facing changes.
-
-## 2.22.8 - 23 Nov 2023
-
-- Update default CodeQL bundle version to 2.15.3. [#2001](https://github.com/github/codeql-action/pull/2001)
-
-## 2.22.7 - 16 Nov 2023
-
-- Add a deprecation warning for customers using CodeQL version 2.11.5 and earlier. These versions of CodeQL were discontinued on 8 November 2023 alongside GitHub Enterprise Server 3.7, and will be unsupported by CodeQL Action v2.23.0 and later. [#1993](https://github.com/github/codeql-action/pull/1993)
-  - If you are using one of these versions, please update to CodeQL CLI version 2.11.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.10.5 and 2.11.5, you can replace `github/codeql-action/*@v2` by `github/codeql-action/*@v2.22.7` in your code scanning workflow to ensure you continue using this version of the CodeQL Action.
-
-## 2.22.6 - 14 Nov 2023
-
-- Customers running Python analysis on macOS using version 2.14.6 or earlier of the CodeQL CLI should upgrade to CodeQL CLI version 2.15.0 or later. If you do not wish to upgrade the CodeQL CLI, ensure that you are using Python version 3.11 or earlier, as CodeQL version 2.14.6 and earlier do not support Python 3.12. You can achieve this by adding a [`setup-python`](https://github.com/actions/setup-python) step to your code scanning workflow before the step that invokes `github/codeql-action/init`.
-- Update default CodeQL bundle version to 2.15.2. [#1978](https://github.com/github/codeql-action/pull/1978)
-
-## 2.22.5 - 27 Oct 2023
-
-No user facing changes.
-
-## 2.22.4 - 20 Oct 2023
-
-- Update default CodeQL bundle version to 2.15.1. [#1953](https://github.com/github/codeql-action/pull/1953)
-- Users will begin to see warnings on Node.js 16 deprecation in their Actions logs on code scanning runs starting October 23, 2023.
-  - All code scanning workflows should continue to succeed regardless of the warning.
-  - The team at GitHub maintaining the CodeQL Action is aware of the deprecation timeline and actively working on creating another version of the CodeQL Action, v3, that will bump us to Node 20.
-  - For more information, and to communicate with the maintaining team, please use [this issue](https://github.com/github/codeql-action/issues/1959).
-
-## 2.22.3 - 13 Oct 2023
-
-- Provide an authentication token when downloading the CodeQL Bundle from the API of a GitHub Enterprise Server instance. [#1945](https://github.com/github/codeql-action/pull/1945)
-
-## 2.22.2 - 12 Oct 2023
-
-- Update default CodeQL bundle version to 2.15.0. [#1938](https://github.com/github/codeql-action/pull/1938)
-- Improve the log output when an error occurs in an invocation of the CodeQL CLI. [#1927](https://github.com/github/codeql-action/pull/1927)
-
-## 2.22.1 - 09 Oct 2023
-
-- Add a workaround for Python 3.12, which is not supported in CodeQL CLI version 2.14.6 or earlier. If you are running an analysis on Windows and using Python 3.12 or later, the CodeQL Action will switch to running Python 3.11. In this case, if Python 3.11 is not found, then the workflow will fail. [#1928](https://github.com/github/codeql-action/pull/1928)
-
 ## 2.22.0 - 06 Oct 2023
 
 - The CodeQL Action now requires CodeQL version 2.10.5 or later. For more information, see the corresponding changelog entry for CodeQL Action version 2.21.8. [#1907](https://github.com/github/codeql-action/pull/1907)

CODEOWNERS

@@ -1 +1,3 @@
 **/* @github/codeql-action-reviewers
+
+/python-setup/ @github/codeql-python @github/codeql-action-reviewers

CONTRIBUTING.md

@@ -3,7 +3,6 @@
 [fork]: https://github.com/github/codeql-action/fork
 [pr]: https://github.com/github/codeql-action/compare
 [code-of-conduct]: CODE_OF_CONDUCT.md
-[readme]: README.md#supported-versions-of-the-codeql-cli-and-github-enterprise-server
 
 Hi there! We're thrilled that you'd like to contribute to this project. Your help is essential for keeping it great.
 
@@ -27,7 +26,7 @@ You may want to run `tsc --watch` from the command line or inside of vscode in o
 
 ### Checking in compiled artifacts and `node_modules`
 
-Because CodeQL Action users consume the code directly from this repository, and there can be no build step during a GitHub Actions run, this repository contains all compiled artifacts and node modules. There is a PR check that will fail if any of the compiled artifacts are not up to date. Compiled artifacts are stored in the `lib/` directory. For all day-to-day development purposes, this folder can be ignored.
+Because CodeQL Action users consume the code directly from this repository, and there can be no build step during an GitHub Actions run, this repository contains all compiled artifacts and node modules. There is a PR check that will fail if any of the compiled artifacts are not up to date. Compiled artifacts are stored in the `lib/` directory. For all day-to-day development purposes, this folder can be ignored.
 
 Only run `npm install` if you are explicitly changing the set of dependencies in `package.json`. The `node_modules` directory should be up to date when you check out, but if for some reason, there is an inconsistency use `npm ci && npm run removeNPMAbsolutePaths` to ensure the directory is in a state consistent with the `package-lock.json`. Note that due to a macOS-specific dependency, this command should be run on a macOS machine. There is a PR check to ensure the consistency of the `node_modules` directory.
 
@@ -58,15 +57,18 @@ Here are a few things you can do that will increase the likelihood of your pull
 ## Releasing (write access required)
 
 1. The first step of releasing a new version of the `codeql-action` is running the "Update release branch" workflow.
-    This workflow goes through the pull requests that have been merged to `main` since the last release, creates a changelog, then opens a pull request to merge the changes since the last release into the `releases/v3` release branch.
+    This workflow goes through the pull requests that have been merged to `main` since the last release, creates a changelog, then opens a pull request to merge the changes since the last release into the `releases/v2` release branch.
 
     You can start a release by triggering this workflow via [workflow dispatch](https://github.com/github/codeql-action/actions/workflows/update-release-branch.yml).
-1. The workflow run will open a pull request titled "Merge main into releases/v3". Follow the steps on the checklist in the pull request. Once you've checked off all but the last two of these, approve the PR and automerge it.
+1. The workflow run will open a pull request titled "Merge main into releases/v2". Mark the pull request as [ready for review](https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request#marking-a-pull-request-as-ready-for-review) to trigger the PR checks.
-1. When the "Merge main into releases/v3" pull request is merged into the `releases/v3` branch, a mergeback pull request to `main` will be automatically created. This mergeback pull request incorporates the changelog updates into `main`, tags the release using the merge commit of the "Merge main into releases/v3" pull request, and bumps the patch version of the CodeQL Action. 
+1. Review the checklist items in the pull request description.
-1. If a backport to an older major version is required, a pull request targeting that version's branch will also be automatically created.
+    Once you've checked off all but the last two of these, approve the PR and automerge it.
-1. Approve the mergeback and backport pull request (if applicable) and automerge them.
+1. When the "Merge main into releases/v2" pull request is merged into the `releases/v2` branch, the "Tag release and merge back" workflow will create a mergeback PR.
+    This mergeback incorporates the changelog updates into `main`, tags the release using the merge commit of the "Merge main into releases/v2" pull request, and bumps the patch version of the CodeQL Action.
 
-Once the mergeback and backport pull request have been merged, the release is complete.
+    Approve the mergeback PR and automerge it.
+
+Once the mergeback has been merged to `main`, the release is complete.
 
 ## Keeping the PR checks up to date (admin access required)
 
@@ -74,9 +76,7 @@ Since the `codeql-action` runs most of its testing through individual Actions wo
 
 1. By default, this script retrieves the checks from the latest SHA on `main`, so make sure that your `main` branch is up to date.
 2. Run the script. If there's a reason to, you can pass in a different SHA as a CLI argument.
-3. After running, go to the [branch protection rules settings page](https://github.com/github/codeql-action/settings/branches) and validate that the rules for `main`, `v3`, and any other currently supported major versions have been updated.
+3. After running, go to the [branch protection rules settings page](https://github.com/github/codeql-action/settings/branches) and validate that the rules for `main`, `v1`, and `v2` have been updated.
-
-Note that any updates to checks on `main` need to be backported to all currently supported major version branches, in order to maintain the same set of names for required checks.
 
 ## Deprecating a CodeQL version (write access required)
 
@@ -86,7 +86,6 @@ We typically deprecate a version of CodeQL when the GitHub Enterprise Server (GH
 1. Notify users using the old version of CodeQL about the deprecation.
     - Update `CODEQL_NEXT_MINIMUM_VERSION`, `GHES_VERSION_MOST_RECENTLY_DEPRECATED`, and `GHES_MOST_RECENT_DEPRECATION_DATE` in `src/codeql.ts` to reflect the new minimum version of CodeQL and the GHES version that has just been deprecated.
     - Add a changelog note announcing the deprecation.
-    - Update the CLI version referenced in the [readme] by adding a new row to the compatibility table.
     - Example PR: https://github.com/github/codeql-action/pull/1884
 1. Release the Action, or wait for the next scheduled release of the Action, then wait at least a week so users have time to see and act on the deprecation warning.
 1. Remove support for the old version of CodeQL.
@@ -100,30 +99,6 @@ We typically deprecate a version of CodeQL when the GitHub Enterprise Server (GH
     - Add a changelog note announcing the new minimum version of CodeQL that is now required.
     - Example PR: https://github.com/github/codeql-action/pull/1907
 
-## Adding a new CodeQL Action major version
-
-We sometimes maintain multiple versions of the CodeQL Action to enable customers on older but still supported versions of GitHub Enterprise Server (GHES) to continue to benefit from the latest CodeQL improvements. To accomplish this, the release process automation listens to updates to the release branch for the newest supported version.  When this branch is updated, the release process automatically opens backport PRs to update the release branches for older versions.
-
-To add a new major version of the Action:
-
-1. Change the `version` field of `package.json` by running `npm version x.y.z` where `x` is the new major version, and `y` and `z` match the latest minor and patch versions of the last release.
-1. Update appropriate documentation to explain the reasoning behind the releases: see [the diff](https://github.com/github/codeql-action/pull/2677/commits/913d60579d4b560addf53ec3c493d491dd3c1378) in our last major version deprecation for examples on which parts of the documentation should be updated.
-1. Consider the timeline behind deprecating the prior Action version: see [CodeQL Action deprecation documentation](#deprecating-a-codeql-action-major-version-write-access-required)
-1. If the new major version runs on a new version of Node, add a PR check to ensure the codebase continues to compile against the previous version of Node. See [Remove Node 16 compilation PR check](https://github.com/github/codeql-action/pull/2695) for an example.
-
-## Deprecating a CodeQL Action major version (write access required)
-
-We typically deprecate older versions of the Action once all supported GHES versions are compatible with the version of Node.js we are using on `main`.
-
-To deprecate an older version of the Action:
-
-1. Notify any users who are still pinned to the `vN` tag of the deprecated version of the Action, giving as much notice as is practical.
-   - Add a changelog note announcing the deprecation.
-   - Implement an Actions warning for customers using the deprecated version.
-1. Wait for the deprecation period to pass.
-1. Upgrade the Actions warning for customers using the deprecated version to a non-fatal error, and mention that this version of the Action is no longer supported.
-1. Make a PR to bump the `OLDEST_SUPPORTED_MAJOR_VERSION` in [releases.ini](.github/releases.ini).  Once this PR is merged, the release process will no longer backport changes to the deprecated release version.
-
 ## Resources
 
 - [How to Contribute to Open Source](https://opensource.guide/how-to-contribute/)

README.md

@@ -8,7 +8,7 @@ For a list of recent changes, see the CodeQL Action's [changelog](CHANGELOG.md).
 
 This project is released under the [MIT License](LICENSE).
 
-The underlying CodeQL CLI, used in this action, is licensed under the [GitHub CodeQL Terms and Conditions](https://securitylab.github.com/tools/codeql/license). As such, this action may be used on open source projects hosted on GitHub, and on private repositories that are owned by an organisation with GitHub Advanced Security enabled.
+The underlying CodeQL CLI, used in this action, is licensed under the [GitHub CodeQL Terms and Conditions](https://securitylab.github.com/tools/codeql/license). As such, this action may be used on open source projects hosted on GitHub, and on  private repositories that are owned by an organisation with GitHub Advanced Security enabled.
 
 ## Usage
 
@@ -16,67 +16,6 @@ We recommend using default setup to configure CodeQL analysis for your repositor
 
 You can also configure advanced setup for a repository to find security vulnerabilities in your code using a highly customizable code scanning configuration. For more information, see "[Configuring advanced setup for code scanning](https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/configuring-advanced-setup-for-code-scanning)" and "[Customizing your advanced setup for code scanning](https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning)."
 
-### Actions
-
-This repository contains several actions that enable you to analyze code in your repository using CodeQL and upload the analysis to GitHub Code Scanning. Actions in this repository also allow you to upload to GitHub analyses generated by any SARIF-producing SAST tool.
-
-Actions for CodeQL analyses:
-
-- `init`: Sets up CodeQL for analysis. For information about input parameters, see the [init action definition](https://github.com/github/codeql-action/blob/main/init/action.yml).
-- `analyze`: Finalizes the CodeQL database, runs the analysis, and uploads the results to Code Scanning. For information about input parameters, see the [analyze action definition](https://github.com/github/codeql-action/blob/main/analyze/action.yml).
-
-Actions for uploading analyses generated by third-party tools:
-
-- `upload-sarif`: Uploads a SARIF file to Code Scanning. If you are using the `analyze` action, there is no reason to use this action as well. For information about input parameters, see the [upload-sarif action definition](https://github.com/github/codeql-action/blob/main/upload-sarif/action.yml).
-
-Actions with special purposes and unlikely to be used directly:
-
-- `autobuild`: Attempts to automatically build the code. Only used for analyzing languages that require a build. Use the `build-mode: autobuild` input in the `init` action instead. For information about input parameters, see the [autobuild action definition](https://github.com/github/codeql-action/blob/main/autobuild/action.yml).
-- `resolve-environment`: [Experimental] Attempts to infer a build environment suitable for automatic builds. For information about input parameters, see the [resolve-environment action definition](https://github.com/github/codeql-action/blob/main/resolve-environment/action.yml).
-- `start-proxy`: [Experimental] Start the HTTP proxy server. Internal use only and will change without notice. For information about input parameters, see the [start-proxy action definition](https://github.com/github/codeql-action/blob/main/start-proxy/action.yml).
-
-### Workflow Permissions
-
-All advanced setup code scanning workflows must have the `security-events: write` permission. Workflows in private repositories must additionally have the `contents: read` permission. For more information, see "[Assigning permissions to jobs](https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs)."
-
-### Build Modes
-
-The CodeQL Action supports different build modes for analyzing the source code. The available build modes are:
-
-- `none`: The database will be created without building the source code. Available for all interpreted languages and some compiled languages.
-- `autobuild`: The database will be created by attempting to automatically build the source code. Available for all compiled languages.
-- `manual`: The database will be created by building the source code using a manually specified build command. To use this build mode, specify manual build steps in your workflow between the `init` and `analyze` steps. Available for all compiled languages.
-
-#### Which build mode should I use?
-
-Interpreted languages must use `none` for the build mode.
-
-For compiled languages:
-
-- `manual` build mode will typically produce the most precise results, but it is more difficult to set up and will cause the analysis to take slightly more time to run.
-- `autobuild` build mode is simpler to set up, but will only work for projects with generic build steps that can be guessed by the heuristics of the autobuild scripts. If `autobuild` fails, then you must switch to `manual` or `none`. If `autobuild` succeeds, then the results and run time will be the same as `manual` mode.
-- `none` build mode is also simpler to set up and is slightly faster to run, but there is a possibility that some alerts will be missed. This may happen if your repository does any code generation during compilation or if there are any dependencies downloaded from registries that the workflow does not have access to. `none` is not yet supported by C/C++, Swift, Go, or Kotlin.
-
-
-## Supported versions of the CodeQL Action
-
-The following versions of the CodeQL Action are currently supported:
-
-- v3 (latest)
-
-## Supported versions of the CodeQL Bundle on GitHub Enterprise Server
-
-We typically release new minor versions of the CodeQL Action and Bundle when a new minor version of GitHub Enterprise Server (GHES) is released. When a version of GHES is deprecated, the CodeQL Action and Bundle releases that shipped with it are deprecated as well.
-
-| Minimum CodeQL Action | Minimum CodeQL Bundle Version | GitHub Environment | Notes |
-|-----------------------|-------------------------------|--------------------|-------|
-| `v3.26.6`  | `2.18.4` | Enterprise Server 3.15 | |
-| `v3.25.11` | `2.17.6` | Enterprise Server 3.14 | |
-| `v3.24.11` | `2.16.6` | Enterprise Server 3.13 | |
-| `v3.22.12` | `2.15.5` | Enterprise Server 3.12 | |
-
-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).