update required checks script to handle new release branch

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

@@ -1,19 +1,12 @@
 import argparse
 import json
 import os
-import configparser
+import subprocess
 
 # Name of the remote
 ORIGIN = 'origin'
 
-script_dir = os.path.dirname(os.path.realpath(__file__))
+OLDEST_SUPPORTED_MAJOR_VERSION = 2
-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():
 

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

@@ -16,7 +16,7 @@ runs:
       shell: bash
 
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
       with:
         python-version: 3.8
 

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

@@ -33,7 +33,7 @@ runs:
         fi
         echo "version=$VERSION" | tee -a $GITHUB_OUTPUT
 
-    - uses: redsun82/setup-swift@b2b6f77ab14f6a9b136b520dc53ec8eca27d2b99 # 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/dependabot.yml

@@ -2,8 +2,6 @@ version: 2
 updates:
   - package-ecosystem: npm
     directory: "/"
-    reviewers:
-      - "github/codeql-production-shield"
     schedule:
       interval: weekly
     labels:
@@ -22,8 +20,6 @@ updates:
           - "*"
   - package-ecosystem: github-actions
     directory: "/"
-    reviewers:
-      - "github/codeql-production-shield"
     schedule:
       interval: weekly
     groups:
@@ -32,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=2

.github/update-release-branch.py

@@ -60,7 +60,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}.')
@@ -92,7 +92,7 @@ def open_pr(
       '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:
@@ -186,17 +186,16 @@ def process_changelog_for_backports(source_branch_major_version, target_branch_m
   with open('CHANGELOG.md', 'r') as f:
 
     # until we find the first section, just duplicate all lines
-    found_first_section = False
+    while True:
-    while not found_first_section:
       line = f.readline()
       if not line:
         raise Exception('Could not find any change sections in CHANGELOG.md') # EOF
 
+      output += line
       if line.startswith('## '):
         line = line.replace(f'## {source_branch_major_version}', f'## {target_branch_major_version}')
-        found_first_section = True
+        # we have found the first section, so now handle things differently
-
+        break
-      output += line
 
     # found_content tracks whether we hit two headings in a row
     found_content = False

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

@@ -11,24 +11,22 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   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:
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: nightly-latest
+          version: nightly-latest
     name: All-platform bundle
     permissions:
       contents: read
@@ -36,38 +34,50 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
+
-          python-version: '3.11'
+        matrix.version == 'stable-v2.13.5' ||
-      - name: Check out repository
+
-        uses: actions/checkout@v4
+        matrix.version == 'stable-v2.14.6')
-      - name: Prepare test
+      with:
-        id: prepare-test
+        python-version: '3.11'
-        uses: ./.github/actions/prepare-test
+    - name: Check out repository
-        with:
+      uses: actions/checkout@v4
-          version: ${{ matrix.version }}
+    - name: Prepare test
-          use-all-platform-bundle: 'true'
+      id: prepare-test
-      - id: init
+      uses: ./.github/actions/prepare-test
-        uses: ./../action/init
+      with:
-        with:
+        version: ${{ matrix.version }}
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+        use-all-platform-bundle: 'true'
-      - uses: ./../action/.github/actions/setup-swift
+    - name: Set environment variable for Swift enablement
-        with:
+      if: >-
-          codeql-path: ${{ steps.init.outputs.codeql-path }}
+        runner.os != 'Windows' && (
-      - name: Build code
+            matrix.version == '20220908' ||
-        shell: bash
+            matrix.version == '20221211'
-        run: ./build.sh
+        )
-      - uses: ./../action/analyze
+      shell: bash
-        with:
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-          upload-database: false
+    - id: init
+      uses: ./../action/init
+      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

@@ -11,28 +11,26 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   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:
       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
     name: "Analyze: 'ref' and 'sha' from inputs"
     permissions:
       contents: read
@@ -40,39 +38,51 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
+
-          python-version: '3.11'
+        matrix.version == 'stable-v2.13.5' ||
-      - name: Check out repository
+
-        uses: actions/checkout@v4
+        matrix.version == 'stable-v2.14.6')
-      - name: Prepare test
+      with:
-        id: prepare-test
+        python-version: '3.11'
-        uses: ./.github/actions/prepare-test
+    - name: Check out repository
-        with:
+      uses: actions/checkout@v4
-          version: ${{ matrix.version }}
+    - name: Prepare test
-          use-all-platform-bundle: 'false'
+      id: prepare-test
-      - uses: ./../action/init
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+        version: ${{ matrix.version }}
-          languages: cpp,csharp,java,javascript,python
+        use-all-platform-bundle: 'false'
-          config-file: ${{ github.repository }}/tests/multi-language-repo/.github/codeql/custom-queries.yml@${{
+    - name: Set environment variable for Swift enablement
-            github.sha }}
+      if: >-
-      - name: Build code
+        runner.os != 'Windows' && (
-        shell: bash
+            matrix.version == '20220908' ||
-        run: ./build.sh
+            matrix.version == '20221211'
-      - uses: ./../action/analyze
+        )
-        with:
+      shell: bash
-          upload-database: false
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-          ref: refs/heads/main
+    - uses: ./../action/init
-          sha: 5e235361806c361d4d3f8859e3c897658025a9a2
+      with:
+        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
+      with:
+        upload-database: false
+        ref: refs/heads/main
+        sha: 5e235361806c361d4d3f8859e3c897658025a9a2
     env:
       CODEQL_ACTION_TEST_MODE: true

.github/workflows/__autobuild-action.yml

@@ -11,28 +11,26 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   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:
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: latest
+          version: latest
-          - os: macos-latest
+        - os: macos-latest
-            version: latest
+          version: latest
-          - os: windows-latest
+        - os: windows-latest
-            version: latest
+          version: latest
     name: autobuild-action
     permissions:
       contents: read
@@ -40,49 +38,61 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
+
-          python-version: '3.11'
+        matrix.version == 'stable-v2.13.5' ||
-      - name: Check out repository
+
-        uses: actions/checkout@v4
+        matrix.version == 'stable-v2.14.6')
-      - name: Prepare test
+      with:
-        id: prepare-test
+        python-version: '3.11'
-        uses: ./.github/actions/prepare-test
+    - name: Check out repository
-        with:
+      uses: actions/checkout@v4
-          version: ${{ matrix.version }}
+    - name: Prepare test
-          use-all-platform-bundle: 'false'
+      id: prepare-test
-      - uses: ./../action/init
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          languages: csharp
+        version: ${{ matrix.version }}
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+        use-all-platform-bundle: 'false'
-      - uses: ./../action/autobuild
+    - name: Set environment variable for Swift enablement
-        env:
+      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
+      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
-        with:
+      with:
-          upload-database: false
+        upload-database: false
-      - name: Check database
+    - name: Check database
-        shell: bash
+      shell: bash
-        run: |
+      run: |
-          cd "$RUNNER_TEMP/codeql_databases"
+        cd "$RUNNER_TEMP/codeql_databases"
-          if [[ ! -d csharp ]]; then
+        if [[ ! -d csharp ]]; then
-            echo "Did not find a C# database"
+          echo "Did not find a C# database"
-            exit 1
+          exit 1
-          fi
+        fi
     env:
       CODEQL_ACTION_TEST_MODE: true

.github/workflows/__autobuild-direct-tracing.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 - Autobuild direct tracing
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  GO111MODULE: auto
-  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
-on:
-  push:
-    branches:
-      - main
-      - releases/v*
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
-  workflow_dispatch: {}
-jobs:
-  autobuild-direct-tracing:
-    strategy:
-      matrix:
-        include:
-          - os: ubuntu-latest
-            version: latest
-          - os: windows-latest
-            version: latest
-          - os: ubuntu-latest
-            version: nightly-latest
-          - os: windows-latest
-            version: nightly-latest
-    name: Autobuild direct tracing
-    permissions:
-      contents: read
-      security-events: write
-    timeout-minutes: 45
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
-        if: >-
-          matrix.os == 'macos-latest' && (
-
-          matrix.version == 'stable-20230403' ||
-
-          matrix.version == 'stable-v2.13.5' ||
-
-          matrix.version == 'stable-v2.14.6')
-        with:
-          python-version: '3.11'
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-      - name: Set up Java test repo configuration
-        shell: bash
-        run: |
-          mv * .github ../action/tests/multi-language-repo/
-          mv ../action/tests/multi-language-repo/.github/workflows .github
-          mv ../action/tests/java-repo/* .
-
-      - uses: ./../action/init
-        id: init
-        with:
-          build-mode: autobuild
-          db-location: ${{ runner.temp }}/customDbLocation
-          languages: java
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
-
-      - name: Check that indirect tracing is disabled
-        shell: bash
-        run: |
-          if [[ ! -z "${CODEQL_RUNNER}" ]]; then
-            echo "Expected indirect tracing to be disabled, but the" \
-              "CODEQL_RUNNER environment variable is set."
-            exit 1
-          fi
-
-      - uses: ./../action/analyze
-    env:
-      CODEQL_ACTION_AUTOBUILD_BUILD_MODE_DIRECT_TRACING: true
-      CODEQL_ACTION_TEST_MODE: true

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

@@ -1,84 +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
-  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
-on:
-  push:
-    branches:
-      - main
-      - releases/v*
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
-  workflow_dispatch: {}
-jobs:
-  build-mode-autobuild:
-    strategy:
-      matrix:
-        include:
-          - os: ubuntu-latest
-            version: nightly-latest
-    name: Build mode autobuild
-    permissions:
-      contents: read
-      security-events: write
-    timeout-minutes: 45
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
-        if: >-
-          matrix.os == 'macos-latest' && (
-
-          matrix.version == 'stable-20230403' ||
-
-          matrix.version == 'stable-v2.13.5' ||
-
-          matrix.version == 'stable-v2.14.6')
-        with:
-          python-version: '3.11'
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-      - name: Set up Java test repo configuration
-        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,86 +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
-  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
-on:
-  push:
-    branches:
-      - main
-      - releases/v*
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
-  workflow_dispatch: {}
-jobs:
-  build-mode-manual:
-    strategy:
-      matrix:
-        include:
-          - os: ubuntu-latest
-            version: nightly-latest
-    name: Build mode manual
-    permissions:
-      contents: read
-      security-events: write
-    timeout-minutes: 45
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
-        if: >-
-          matrix.os == 'macos-latest' && (
-
-          matrix.version == 'stable-20230403' ||
-
-          matrix.version == 'stable-v2.13.5' ||
-
-          matrix.version == 'stable-v2.14.6')
-        with:
-          python-version: '3.11'
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-      - 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
-
-      - 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
-    env:
-      CODEQL_ACTION_TEST_MODE: true

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

@@ -1,84 +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
-  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
-on:
-  push:
-    branches:
-      - main
-      - releases/v*
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
-  workflow_dispatch: {}
-jobs:
-  build-mode-none:
-    strategy:
-      matrix:
-        include:
-          - os: ubuntu-latest
-            version: latest
-          - os: ubuntu-latest
-            version: nightly-latest
-    name: Build mode none
-    permissions:
-      contents: read
-      security-events: write
-    timeout-minutes: 45
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
-        if: >-
-          matrix.os == 'macos-latest' && (
-
-          matrix.version == 'stable-20230403' ||
-
-          matrix.version == 'stable-v2.13.5' ||
-
-          matrix.version == 'stable-v2.14.6')
-        with:
-          python-version: '3.11'
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-      - 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,85 +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
-  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
-on:
-  push:
-    branches:
-      - main
-      - releases/v*
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
-  workflow_dispatch: {}
-jobs:
-  build-mode-rollback:
-    strategy:
-      matrix:
-        include:
-          - os: ubuntu-latest
-            version: nightly-latest
-    name: Build mode rollback
-    permissions:
-      contents: read
-      security-events: write
-    timeout-minutes: 45
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
-        if: >-
-          matrix.os == 'macos-latest' && (
-
-          matrix.version == 'stable-20230403' ||
-
-          matrix.version == 'stable-v2.13.5' ||
-
-          matrix.version == 'stable-v2.14.6')
-        with:
-          python-version: '3.11'
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-      - name: Set up Java test repo configuration
-        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/__config-export.yml

@@ -11,34 +11,32 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   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:
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: latest
+          version: latest
-          - os: macos-latest
+        - os: macos-latest
-            version: latest
+          version: latest
-          - os: windows-latest
+        - os: windows-latest
-            version: latest
+          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
@@ -46,66 +44,79 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
-          python-version: '3.11'
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-      - uses: ./../action/init
-        with:
-          languages: javascript
-          queries: security-extended
-          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@v3
-        with:
-          name: config-export-${{ matrix.os }}-${{ matrix.version }}.sarif.json
-          path: ${{ runner.temp }}/results/javascript.sarif
-          retention-days: 7
-      - name: Check config properties appear 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'));
+        matrix.version == 'stable-v2.13.5' ||
-            const run = sarif.runs[0];
-            const configSummary = run.properties.codeqlConfigSummary;
 
-            if (configSummary === undefined) {
+        matrix.version == 'stable-v2.14.6')
-              core.setFailed('`codeqlConfigSummary` property not found in the SARIF run property bag.');
+      with:
-            }
+        python-version: '3.11'
-            if (configSummary.disableDefaultQueries !== false) {
+    - name: Check out repository
-              core.setFailed('`disableDefaultQueries` property incorrect: expected false, got ' +
+      uses: actions/checkout@v4
-                `${JSON.stringify(configSummary.disableDefaultQueries)}.`);
+    - name: Prepare test
-            }
+      id: prepare-test
-            const expectedQueries = [{ type: 'builtinSuite', uses: 'security-extended' }];
+      uses: ./.github/actions/prepare-test
-            // Use JSON.stringify to deep-equal the arrays.
+      with:
-            if (JSON.stringify(configSummary.queries) !== JSON.stringify(expectedQueries)) {
+        version: ${{ matrix.version }}
-              core.setFailed(`\`queries\` property incorrect: expected ${JSON.stringify(expectedQueries)}, got ` +
+        use-all-platform-bundle: 'false'
-                `${JSON.stringify(configSummary.queries)}.`);
+    - name: Set environment variable for Swift enablement
-            }
+      if: >-
-            core.info('Finished config export tests.');
+        runner.os != 'Windows' && (
+            matrix.version == '20220908' ||
+            matrix.version == '20221211'
+        )
+      shell: bash
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
+    - uses: ./../action/init
+      with:
+        languages: javascript
+        queries: security-extended
+        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@v3
+      with:
+        name: config-export-${{ matrix.os }}-${{ matrix.version }}.sarif.json
+        path: ${{ runner.temp }}/results/javascript.sarif
+        retention-days: 7
+    - name: Check config properties appear 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 configSummary = run.properties.codeqlConfigSummary;
+
+          if (configSummary === undefined) {
+            core.setFailed('`codeqlConfigSummary` property not found in the SARIF run property bag.');
+          }
+          if (configSummary.disableDefaultQueries !== false) {
+            core.setFailed('`disableDefaultQueries` property incorrect: expected false, got ' + 
+              `${JSON.stringify(configSummary.disableDefaultQueries)}.`);
+          }
+          const expectedQueries = [{ type: 'builtinSuite', uses: 'security-extended' }];
+          // Use JSON.stringify to deep-equal the arrays.
+          if (JSON.stringify(configSummary.queries) !== JSON.stringify(expectedQueries)) {
+            core.setFailed(`\`queries\` property incorrect: expected ${JSON.stringify(expectedQueries)}, got ` + 
+              `${JSON.stringify(configSummary.queries)}.`);
+          }
+          core.info('Finished config export tests.');
     env:
+      CODEQL_PASS_CONFIG_TO_CLI: true
       CODEQL_ACTION_TEST_MODE: true

.github/workflows/__config-input.yml

@@ -1,88 +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
-  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
-on:
-  push:
-    branches:
-      - main
-      - releases/v*
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
-  workflow_dispatch: {}
-jobs:
-  config-input:
-    strategy:
-      matrix:
-        include:
-          - os: ubuntu-latest
-            version: latest
-    name: Config input
-    permissions:
-      contents: read
-      security-events: write
-    timeout-minutes: 45
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
-        if: >-
-          matrix.os == 'macos-latest' && (
-
-          matrix.version == 'stable-20230403' ||
-
-          matrix.version == 'stable-v2.13.5' ||
-
-          matrix.version == 'stable-v2.14.6')
-        with:
-          python-version: '3.11'
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-      - name: 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

@@ -11,28 +11,26 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   cpp-deptrace-disabled:
     strategy:
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: latest
+          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: 'C/C++: disabling autoinstalling dependencies (Linux)'
     permissions:
       contents: read
@@ -40,45 +38,57 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
+
-          python-version: '3.11'
+        matrix.version == 'stable-v2.13.5' ||
-      - name: Check out repository
+
-        uses: actions/checkout@v4
+        matrix.version == 'stable-v2.14.6')
-      - name: Prepare test
+      with:
-        id: prepare-test
+        python-version: '3.11'
-        uses: ./.github/actions/prepare-test
+    - name: Check out repository
-        with:
+      uses: actions/checkout@v4
-          version: ${{ matrix.version }}
+    - name: Prepare test
-          use-all-platform-bundle: 'false'
+      id: prepare-test
-      - name: Test setup
+      uses: ./.github/actions/prepare-test
-        shell: bash
+      with:
-        run: |
+        version: ${{ matrix.version }}
-          cp -a ../action/tests/cpp-autobuild autobuild-dir
+        use-all-platform-bundle: 'false'
-      - uses: ./../action/init
+    - name: Set environment variable for Swift enablement
-        with:
+      if: >-
-          languages: cpp
+        runner.os != 'Windows' && (
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+            matrix.version == '20220908' ||
-      - uses: ./../action/autobuild
+            matrix.version == '20221211'
-        with:
+        )
-          working-directory: autobuild-dir
+      shell: bash
-        env:
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-          CODEQL_EXTRACTOR_CPP_AUTOINSTALL_DEPENDENCIES: false
+    - name: Test setup
-      - shell: bash
+      shell: bash
-        run: |
+      run: |
-          if ls /usr/bin/errno; then
+        cp -a ../action/tests/cpp-autobuild autobuild-dir
-            echo "C/C++ autobuild installed errno, but it should not have since auto-install dependencies is disabled."
+    - uses: ./../action/init
-            exit 1
+      with:
-          fi
+        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

@@ -11,24 +11,22 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   cpp-deptrace-enabled-on-macos:
     strategy:
       matrix:
         include:
-          - os: macos-latest
+        - os: macos-latest
-            version: nightly-latest
+          version: nightly-latest
     name: 'C/C++: autoinstalling dependencies is skipped (macOS)'
     permissions:
       contents: read
@@ -36,47 +34,59 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
+
-          python-version: '3.11'
+        matrix.version == 'stable-v2.13.5' ||
-      - name: Check out repository
+
-        uses: actions/checkout@v4
+        matrix.version == 'stable-v2.14.6')
-      - name: Prepare test
+      with:
-        id: prepare-test
+        python-version: '3.11'
-        uses: ./.github/actions/prepare-test
+    - name: Check out repository
-        with:
+      uses: actions/checkout@v4
-          version: ${{ matrix.version }}
+    - name: Prepare test
-          use-all-platform-bundle: 'false'
+      id: prepare-test
-      - name: Test setup
+      uses: ./.github/actions/prepare-test
-        shell: bash
+      with:
-        run: |
+        version: ${{ matrix.version }}
-          cp -a ../action/tests/cpp-autobuild autobuild-dir
+        use-all-platform-bundle: 'false'
-      - uses: ./../action/init
+    - name: Set environment variable for Swift enablement
-        with:
+      if: >-
-          languages: cpp
+        runner.os != 'Windows' && (
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+            matrix.version == '20220908' ||
-      - uses: ./../action/autobuild
+            matrix.version == '20221211'
-        with:
+        )
-          working-directory: autobuild-dir
+      shell: bash
-        env:
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-          CODEQL_EXTRACTOR_CPP_AUTOINSTALL_DEPENDENCIES: true
+    - name: Test setup
-      - shell: bash
+      shell: bash
-        run: |
+      run: |
-          if ! ls /usr/bin/errno; then
+        cp -a ../action/tests/cpp-autobuild autobuild-dir
-            echo "As expected, CODEQL_EXTRACTOR_CPP_AUTOINSTALL_DEPENDENCIES is a no-op on macOS"
+    - uses: ./../action/init
-          else
+      with:
-            echo "CODEQL_EXTRACTOR_CPP_AUTOINSTALL_DEPENDENCIES should not have had any effect on macOS"
+        languages: cpp
-            exit 1
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
-          fi
+    - 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

@@ -11,28 +11,26 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   cpp-deptrace-enabled:
     strategy:
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: latest
+          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: 'C/C++: autoinstalling dependencies (Linux)'
     permissions:
       contents: read
@@ -40,45 +38,57 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
+
-          python-version: '3.11'
+        matrix.version == 'stable-v2.13.5' ||
-      - name: Check out repository
+
-        uses: actions/checkout@v4
+        matrix.version == 'stable-v2.14.6')
-      - name: Prepare test
+      with:
-        id: prepare-test
+        python-version: '3.11'
-        uses: ./.github/actions/prepare-test
+    - name: Check out repository
-        with:
+      uses: actions/checkout@v4
-          version: ${{ matrix.version }}
+    - name: Prepare test
-          use-all-platform-bundle: 'false'
+      id: prepare-test
-      - name: Test setup
+      uses: ./.github/actions/prepare-test
-        shell: bash
+      with:
-        run: |
+        version: ${{ matrix.version }}
-          cp -a ../action/tests/cpp-autobuild autobuild-dir
+        use-all-platform-bundle: 'false'
-      - uses: ./../action/init
+    - name: Set environment variable for Swift enablement
-        with:
+      if: >-
-          languages: cpp
+        runner.os != 'Windows' && (
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+            matrix.version == '20220908' ||
-      - uses: ./../action/autobuild
+            matrix.version == '20221211'
-        with:
+        )
-          working-directory: autobuild-dir
+      shell: bash
-        env:
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-          CODEQL_EXTRACTOR_CPP_AUTOINSTALL_DEPENDENCIES: true
+    - name: Test setup
-      - shell: bash
+      shell: bash
-        run: |
+      run: |
-          if ! ls /usr/bin/errno; then
+        cp -a ../action/tests/cpp-autobuild autobuild-dir
-            echo "Did not autoinstall errno"
+    - uses: ./../action/init
-            exit 1
+      with:
-          fi
+        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

@@ -11,40 +11,38 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   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:
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-20230403
+          version: stable-20230317
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-20230403
+          version: stable-20230317
-          - os: windows-latest
+        - os: windows-latest
-            version: stable-20230403
+          version: stable-20230317
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: latest
+          version: latest
-          - os: macos-latest
+        - os: macos-latest
-            version: latest
+          version: latest
-          - os: windows-latest
+        - os: windows-latest
-            version: latest
+          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: Diagnostic export
     permissions:
       contents: read
@@ -52,107 +50,119 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
-          python-version: '3.11'
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-      - uses: ./../action/init
-        id: init
-        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.6 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 $i" \
-              --source-id "lang/diagnostics/example" \
-              --source-name "Diagnostic name" \
-              --ready-for-status-page
-          done
-      - uses: ./../action/analyze
-        with:
-          output: ${{ runner.temp }}/results
-          upload-database: false
-      - name: Upload SARIF
-        uses: actions/upload-artifact@v3
-        with:
-          name: diagnostics-export-${{ matrix.os }}-${{ matrix.version }}.sarif.json
-          path: ${{ runner.temp }}/results/javascript.sarif
-          retention-days: 7
-      - name: Check diagnostics appear in SARIF
-        uses: actions/github-script@v7
-        env:
-          SARIF_PATH: ${{ runner.temp }}/results/javascript.sarif
-        with:
-          script: |
-            const fs = require('fs');
 
-            function checkStatusPageNotification(n) {
+        matrix.version == 'stable-v2.13.5' ||
-              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) {
+        matrix.version == 'stable-v2.14.6')
-                core.setFailed(`Expected the status page diagnostic to have the message '${expectedMessage}', but found '${n.message.text}'.`);
+      with:
-              }
+        python-version: '3.11'
-              if (n.locations.length !== 1) {
+    - name: Check out repository
-                core.setFailed(`Expected the status page diagnostic to have exactly 1 location, but found ${n.locations.length}.`);
+      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:
+        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 $i" \
+            --source-id "lang/diagnostics/example" \
+            --source-name "Diagnostic name" \
+            --ready-for-status-page
+        done
+    - uses: ./../action/analyze
+      with:
+        output: ${{ runner.temp }}/results
+        upload-database: false
+    - name: Upload SARIF
+      uses: actions/upload-artifact@v3
+      with:
+        name: diagnostics-export-${{ matrix.os }}-${{ matrix.version }}.sarif.json
+        path: ${{ runner.temp }}/results/javascript.sarif
+        retention-days: 7
+    - name: Check diagnostics appear in SARIF
+      uses: actions/github-script@v7
+      env:
+        SARIF_PATH: ${{ runner.temp }}/results/javascript.sarif
+      with:
+        script: |
+          const fs = require('fs');
+
+          function checkStatusPageNotification(n) {
+            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) {
+              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}.`);
+            }
+          }
 
-            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

@@ -11,28 +11,26 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   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:
       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
@@ -40,66 +38,78 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
+
-          python-version: '3.11'
+        matrix.version == 'stable-v2.13.5' ||
-      - name: Check out repository
+
-        uses: actions/checkout@v4
+        matrix.version == 'stable-v2.14.6')
-      - name: Prepare test
+      with:
-        id: prepare-test
+        python-version: '3.11'
-        uses: ./.github/actions/prepare-test
+    - name: Check out repository
-        with:
+      uses: actions/checkout@v4
-          version: ${{ matrix.version }}
+    - name: Prepare test
-          use-all-platform-bundle: 'false'
+      id: prepare-test
-      - uses: ./../action/init
+      uses: ./.github/actions/prepare-test
-        id: init
+      with:
-        with:
+        version: ${{ matrix.version }}
-          languages: javascript
+        use-all-platform-bundle: 'false'
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+    - name: Set environment variable for Swift enablement
-      - uses: ./../action/.github/actions/setup-swift
+      if: >-
-        with:
+        runner.os != 'Windows' && (
-          codeql-path: ${{ steps.init.outputs.codeql-path }}
+            matrix.version == '20220908' ||
-      - name: Build code
+            matrix.version == '20221211'
-        shell: bash
+        )
-        run: ./build.sh
+      shell: bash
-      - uses: ./../action/analyze
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-        with:
+    - uses: ./../action/init
-          output: ${{ runner.temp }}/results
+      id: init
-      - name: Upload SARIF
+      with:
-        uses: actions/upload-artifact@v3
+        languages: javascript
-        with:
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
-          name: with-baseline-information-${{ matrix.os }}-${{ matrix.version }}.sarif.json
+    - uses: ./../action/.github/actions/setup-swift
-          path: ${{ runner.temp }}/results/javascript.sarif
+      with:
-          retention-days: 7
+        codeql-path: ${{ steps.init.outputs.codeql-path }}
-      - name: Check results
+    - name: Build code
-        shell: bash
+      shell: bash
-        run: |
+      run: ./build.sh
-          cd "$RUNNER_TEMP/results"
+    - uses: ./../action/analyze
-          expected_baseline_languages="c csharp go java kotlin javascript python ruby"
+      with:
-          if [[ $RUNNER_OS != "Windows" ]]; then
+        output: ${{ runner.temp }}/results
-            expected_baseline_languages+=" swift"
+    - name: Upload SARIF
+      uses: actions/upload-artifact@v3
+      with:
+        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="c csharp go java kotlin javascript python ruby"
+        if [[ $RUNNER_OS != "Windows" ]]; then
+          expected_baseline_languages+=" swift"
+        fi
+
+        for lang in ${expected_baseline_languages}; do
+          rule_name="cli/expected-extracted-files/${lang}"
+          found_notification=$(jq --arg rule_name "${rule_name}" '[.runs[0].tool.driver.notifications |
+            select(. != null) | flatten | .[].id] | any(. == $rule_name)' javascript.sarif)
+          if [[ "${found_notification}" != "true" ]]; then
+            echo "Expected SARIF output to contain notification '${rule_name}', but found no such notification."
+            exit 1
+          else
+            echo "Found notification '${rule_name}'."
           fi
-
+        done
-          for lang in ${expected_baseline_languages}; do
-            rule_name="cli/expected-extracted-files/${lang}"
-            found_notification=$(jq --arg rule_name "${rule_name}" '[.runs[0].tool.driver.notifications |
-              select(. != null) | flatten | .[].id] | any(. == $rule_name)' javascript.sarif)
-            if [[ "${found_notification}" != "true" ]]; then
-              echo "Expected SARIF output to contain notification '${rule_name}', but found no such notification."
-              exit 1
-            else
-              echo "Found notification '${rule_name}'."
-            fi
-          done
     env:
       CODEQL_ACTION_SUBLANGUAGE_FILE_COVERAGE: true
       CODEQL_ACTION_TEST_MODE: true

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

@@ -11,24 +11,22 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   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:
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: latest
+          version: latest
     name: Extractor ram and threads options test
     permissions:
       contents: read
@@ -36,49 +34,61 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
+
-          python-version: '3.11'
+        matrix.version == 'stable-v2.13.5' ||
-      - name: Check out repository
+
-        uses: actions/checkout@v4
+        matrix.version == 'stable-v2.14.6')
-      - name: Prepare test
+      with:
-        id: prepare-test
+        python-version: '3.11'
-        uses: ./.github/actions/prepare-test
+    - name: Check out repository
-        with:
+      uses: actions/checkout@v4
-          version: ${{ matrix.version }}
+    - name: Prepare test
-          use-all-platform-bundle: 'false'
+      id: prepare-test
-      - uses: ./../action/init
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          languages: java
+        version: ${{ matrix.version }}
-          ram: 230
+        use-all-platform-bundle: 'false'
-          threads: 1
+    - name: Set environment variable for Swift enablement
-      - name: Assert Results
+      if: >-
-        shell: bash
+        runner.os != 'Windows' && (
-        run: |
+            matrix.version == '20220908' ||
-          if [ "${CODEQL_RAM}" != "230" ]; then
+            matrix.version == '20221211'
-            echo "CODEQL_RAM is '${CODEQL_RAM}' instead of 230"
+        )
-            exit 1
+      shell: bash
-          fi
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-          if [ "${CODEQL_EXTRACTOR_JAVA_RAM}" != "230" ]; then
+    - uses: ./../action/init
-            echo "CODEQL_EXTRACTOR_JAVA_RAM is '${CODEQL_EXTRACTOR_JAVA_RAM}' instead of 230"
+      with:
-            exit 1
+        languages: java
-          fi
+        ram: 230
-          if [ "${CODEQL_THREADS}" != "1" ]; then
+        threads: 1
-            echo "CODEQL_THREADS is '${CODEQL_THREADS}' instead of 1"
+    - name: Assert Results
-            exit 1
+      shell: bash
-          fi
+      run: |
-          if [ "${CODEQL_EXTRACTOR_JAVA_THREADS}" != "1" ]; then
+        if [ "${CODEQL_RAM}" != "230" ]; then
-            echo "CODEQL_EXTRACTOR_JAVA_THREADS is '${CODEQL_EXTRACTOR_JAVA_THREADS}' instead of 1"
+          echo "CODEQL_RAM is '${CODEQL_RAM}' instead of 230"
-            exit 1
+          exit 1
-          fi
+        fi
+        if [ "${CODEQL_EXTRACTOR_JAVA_RAM}" != "230" ]; then
+          echo "CODEQL_EXTRACTOR_JAVA_RAM is '${CODEQL_EXTRACTOR_JAVA_RAM}' instead of 230"
+          exit 1
+        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

@@ -11,70 +11,68 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   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:
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-20230403
+          version: stable-20220908
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-20230403
+          version: stable-20220908
-          - os: windows-latest
+        - os: windows-latest
-            version: stable-20230403
+          version: stable-20220908
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.13.5
+          version: stable-20221211
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.13.5
+          version: stable-20221211
-          - os: windows-latest
+        - os: windows-latest
-            version: stable-v2.13.5
+          version: stable-20221211
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.14.6
+          version: stable-20230418
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.14.6
+          version: stable-20230418
-          - os: windows-latest
+        - os: windows-latest
-            version: stable-v2.14.6
+          version: stable-20230418
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.15.5
+          version: stable-v2.13.5
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.15.5
+          version: stable-v2.13.5
-          - os: windows-latest
+        - os: windows-latest
-            version: stable-v2.15.5
+          version: stable-v2.13.5
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.16.6
+          version: stable-v2.14.6
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.16.6
+          version: stable-v2.14.6
-          - os: windows-latest
+        - os: windows-latest
-            version: stable-v2.16.6
+          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: windows-latest
+        - os: windows-latest
-            version: default
+          version: default
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: latest
+          version: latest
-          - os: macos-latest
+        - os: macos-latest
-            version: latest
+          version: latest
-          - os: windows-latest
+        - os: windows-latest
-            version: latest
+          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: 'Go: Custom queries'
     permissions:
       contents: read
@@ -82,37 +80,49 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
+
-          python-version: '3.11'
+        matrix.version == 'stable-v2.13.5' ||
-      - name: Check out repository
+
-        uses: actions/checkout@v4
+        matrix.version == 'stable-v2.14.6')
-      - name: Prepare test
+      with:
-        id: prepare-test
+        python-version: '3.11'
-        uses: ./.github/actions/prepare-test
+    - name: Check out repository
-        with:
+      uses: actions/checkout@v4
-          version: ${{ matrix.version }}
+    - name: Prepare test
-          use-all-platform-bundle: 'false'
+      id: prepare-test
-      - uses: ./../action/init
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          languages: go
+        version: ${{ matrix.version }}
-          config-file: ./.github/codeql/custom-queries.yml
+        use-all-platform-bundle: 'false'
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+    - name: Set environment variable for Swift enablement
-      - name: Build code
+      if: >-
-        shell: bash
+        runner.os != 'Windows' && (
-        run: ./build.sh
+            matrix.version == '20220908' ||
-      - uses: ./../action/analyze
+            matrix.version == '20221211'
-        with:
+        )
-          upload-database: false
+      shell: bash
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
+    - uses: ./../action/init
+      with:
+        languages: go
+        config-file: ./.github/codeql/custom-queries.yml
+        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

@@ -11,24 +11,22 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   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:
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.14.6
+          version: stable-v2.14.6
     name: 'Go: diagnostic when Go is changed after init step'
     permissions:
       contents: read
@@ -36,67 +34,79 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
+
-          python-version: '3.11'
+        matrix.version == 'stable-v2.13.5' ||
-      - name: Check out repository
+
-        uses: actions/checkout@v4
+        matrix.version == 'stable-v2.14.6')
-      - name: Prepare test
+      with:
-        id: prepare-test
+        python-version: '3.11'
-        uses: ./.github/actions/prepare-test
+    - name: Check out repository
-        with:
+      uses: actions/checkout@v4
-          version: ${{ matrix.version }}
+    - name: Prepare test
-          use-all-platform-bundle: 'false'
+      id: prepare-test
-      - uses: actions/setup-go@v5
+      uses: ./.github/actions/prepare-test
-        with:
+      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: 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@v7
-        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,103 +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
-  CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true'
-on:
-  push:
-    branches:
-      - main
-      - releases/v*
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
-  workflow_dispatch: {}
-jobs:
-  go-indirect-tracing-workaround-no-file-program:
-    strategy:
-      matrix:
-        include:
-          - os: ubuntu-latest
-            version: stable-v2.14.6
-    name: 'Go: diagnostic when `file` is not installed'
-    permissions:
-      contents: read
-      security-events: write
-    timeout-minutes: 45
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
-        if: >-
-          matrix.os == 'macos-latest' && (
-
-          matrix.version == 'stable-20230403' ||
-
-          matrix.version == 'stable-v2.13.5' ||
-
-          matrix.version == 'stable-v2.14.6')
-        with:
-          python-version: '3.11'
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-      - 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

@@ -11,24 +11,22 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   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:
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.14.6
+          version: stable-v2.14.6
     name: 'Go: workaround for indirect tracing'
     permissions:
       contents: read
@@ -36,65 +34,77 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
+
-          python-version: '3.11'
+        matrix.version == 'stable-v2.13.5' ||
-      - name: Check out repository
+
-        uses: actions/checkout@v4
+        matrix.version == 'stable-v2.14.6')
-      - name: Prepare test
+      with:
-        id: prepare-test
+        python-version: '3.11'
-        uses: ./.github/actions/prepare-test
+    - name: Check out repository
-        with:
+      uses: actions/checkout@v4
-          version: ${{ matrix.version }}
+    - name: Prepare test
-          use-all-platform-bundle: 'false'
+      id: prepare-test
-      - uses: actions/setup-go@v5
+      uses: ./.github/actions/prepare-test
-        with:
+      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: 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
-        with:
+      with:
-          upload-database: false
+        upload-database: false
-      - shell: bash
+    - shell: bash
-        run: |
+      run: |
-          if [[ -z "${CODEQL_ACTION_GO_BINARY}" ]]; then
+        if [[ -z "${CODEQL_ACTION_GO_BINARY}" ]]; then
-            echo "Expected the workaround for indirect tracing of static binaries to trigger, but the" \
+          echo "Expected the workaround for indirect tracing of static binaries to trigger, but the" \
-              "CODEQL_ACTION_GO_BINARY environment variable is not set."
+            "CODEQL_ACTION_GO_BINARY environment variable is not set."
-            exit 1
+          exit 1
-          fi
+        fi
-          if [[ ! -f "${CODEQL_ACTION_GO_BINARY}" ]]; then
+        if [[ ! -f "${CODEQL_ACTION_GO_BINARY}" ]]; then
-            echo "CODEQL_ACTION_GO_BINARY is set, but the corresponding script does not exist."
+          echo "CODEQL_ACTION_GO_BINARY is set, but the corresponding script does not exist."
-            exit 1
+          exit 1
-          fi
+        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

@@ -11,54 +11,52 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   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:
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-20230403
+          version: stable-20220908
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-20230403
+          version: stable-20220908
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.13.5
+          version: stable-20221211
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.13.5
+          version: stable-20221211
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.14.6
+          version: stable-20230418
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.14.6
+          version: stable-20230418
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.15.5
+          version: stable-v2.13.5
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.15.5
+          version: stable-v2.13.5
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.16.6
+          version: stable-v2.14.6
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.16.6
+          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: latest
+          version: latest
-          - os: macos-latest
+        - os: macos-latest
-            version: latest
+          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
@@ -66,52 +64,61 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
+
-          python-version: '3.11'
+        matrix.version == 'stable-v2.13.5' ||
-      - name: Check out repository
+
-        uses: actions/checkout@v4
+        matrix.version == 'stable-v2.14.6')
-      - name: Prepare test
+      with:
-        id: prepare-test
+        python-version: '3.11'
-        uses: ./.github/actions/prepare-test
+    - name: Check out repository
-        with:
+      uses: actions/checkout@v4
-          version: ${{ matrix.version }}
+    - name: Prepare test
-          use-all-platform-bundle: 'false'
+      id: prepare-test
-      - uses: actions/setup-go@v5
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          go-version: ~1.22.0
+        version: ${{ matrix.version }}
-      # to avoid potentially misleading autobuilder results where we expect it to download
+        use-all-platform-bundle: 'false'
-      # dependencies successfully, but they actually come from a warm cache
+    - name: Set environment variable for Swift enablement
-          cache: false
+      if: >-
-      - uses: ./../action/init
+        runner.os != 'Windows' && (
-        with:
+            matrix.version == '20220908' ||
-          languages: go
+            matrix.version == '20221211'
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+        )
-      - uses: ./../action/autobuild
+      shell: bash
-      - uses: ./../action/analyze
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-        with:
+    - uses: actions/setup-go@v4
-          upload-database: false
+      with:
-      - shell: bash
+        go-version: ~1.21.1
-        run: |
+    - uses: ./../action/init
-          if [[ "${CODEQL_ACTION_DID_AUTOBUILD_GOLANG}" != true ]]; then
+      with:
-            echo "Expected the Go autobuilder to be run, but the" \
+        languages: go
-              "CODEQL_ACTION_DID_AUTOBUILD_GOLANG environment variable was not true."
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
-            exit 1
+    - uses: ./../action/autobuild
-          fi
+    - uses: ./../action/analyze
-          cd "$RUNNER_TEMP/codeql_databases"
+      with:
-          if [[ ! -d go ]]; then
+        upload-database: false
-            echo "Did not find a Go database"
+    - shell: bash
-            exit 1
+      run: |
-          fi
+        if [[ "${CODEQL_ACTION_DID_AUTOBUILD_GOLANG}" != true ]]; then
+          echo "Expected the Go autobuilder to be run, but the" \
+            "CODEQL_ACTION_DID_AUTOBUILD_GOLANG environment variable was not true."
+          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

@@ -11,54 +11,52 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   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:
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-20230403
+          version: stable-20220908
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-20230403
+          version: stable-20220908
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.13.5
+          version: stable-20221211
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.13.5
+          version: stable-20221211
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.14.6
+          version: stable-20230418
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.14.6
+          version: stable-20230418
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.15.5
+          version: stable-v2.13.5
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.15.5
+          version: stable-v2.13.5
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.16.6
+          version: stable-v2.14.6
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.16.6
+          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: latest
+          version: latest
-          - os: macos-latest
+        - os: macos-latest
-            version: latest
+          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
@@ -66,56 +64,65 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
+
-          python-version: '3.11'
+        matrix.version == 'stable-v2.13.5' ||
-      - name: Check out repository
+
-        uses: actions/checkout@v4
+        matrix.version == 'stable-v2.14.6')
-      - name: Prepare test
+      with:
-        id: prepare-test
+        python-version: '3.11'
-        uses: ./.github/actions/prepare-test
+    - name: Check out repository
-        with:
+      uses: actions/checkout@v4
-          version: ${{ matrix.version }}
+    - name: Prepare test
-          use-all-platform-bundle: 'false'
+      id: prepare-test
-      - uses: actions/setup-go@v5
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          go-version: ~1.22.0
+        version: ${{ matrix.version }}
-      # to avoid potentially misleading autobuilder results where we expect it to download
+        use-all-platform-bundle: 'false'
-      # dependencies successfully, but they actually come from a warm cache
+    - name: Set environment variable for Swift enablement
-          cache: false
+      if: >-
-      - uses: ./../action/init
+        runner.os != 'Windows' && (
-        with:
+            matrix.version == '20220908' ||
-          languages: go
+            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: go build main.go
+    - uses: actions/setup-go@v4
-      - uses: ./../action/analyze
+      with:
-        with:
+        go-version: ~1.21.1
-          upload-database: false
+    - uses: ./../action/init
-      - shell: bash
+      with:
-        run: |
+        languages: go
-          # Once we start running Bash 4.2 in all environments, we can replace the
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
-          # `! -z` flag with the more elegant `-v` which confirms that the variable
+    - name: Build code
-          # is actually unset and not potentially set to a blank value.
+      shell: bash
-          if [[ ! -z "${CODEQL_ACTION_DID_AUTOBUILD_GOLANG}" ]]; then
+      run: go build main.go
-            echo "Expected the Go autobuilder not to be run, but the" \
+    - uses: ./../action/analyze
-              "CODEQL_ACTION_DID_AUTOBUILD_GOLANG environment variable was set."
+      with:
-            exit 1
+        upload-database: false
-          fi
+    - shell: bash
-          cd "$RUNNER_TEMP/codeql_databases"
+      run: |
-          if [[ ! -d go ]]; then
+        # Once we start running Bash 4.2 in all environments, we can replace the
-            echo "Did not find a Go database"
+        # `! -z` flag with the more elegant `-v` which confirms that the variable
-            exit 1
+        # is actually unset and not potentially set to a blank value.
-          fi
+        if [[ ! -z "${CODEQL_ACTION_DID_AUTOBUILD_GOLANG}" ]]; then
+          echo "Expected the Go autobuilder not to be run, but the" \
+            "CODEQL_ACTION_DID_AUTOBUILD_GOLANG environment variable was set."
+          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

@@ -11,54 +11,52 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   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:
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-20230403
+          version: stable-20220908
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-20230403
+          version: stable-20220908
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.13.5
+          version: stable-20221211
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.13.5
+          version: stable-20221211
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.14.6
+          version: stable-20230418
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.14.6
+          version: stable-20230418
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.15.5
+          version: stable-v2.13.5
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.15.5
+          version: stable-v2.13.5
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.16.6
+          version: stable-v2.14.6
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.16.6
+          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: latest
+          version: latest
-          - os: macos-latest
+        - os: macos-latest
-            version: latest
+          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
@@ -66,46 +64,55 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
+
-          python-version: '3.11'
+        matrix.version == 'stable-v2.13.5' ||
-      - name: Check out repository
+
-        uses: actions/checkout@v4
+        matrix.version == 'stable-v2.14.6')
-      - name: Prepare test
+      with:
-        id: prepare-test
+        python-version: '3.11'
-        uses: ./.github/actions/prepare-test
+    - name: Check out repository
-        with:
+      uses: actions/checkout@v4
-          version: ${{ matrix.version }}
+    - name: Prepare test
-          use-all-platform-bundle: 'false'
+      id: prepare-test
-      - uses: actions/setup-go@v5
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          go-version: ~1.22.0
+        version: ${{ matrix.version }}
-      # to avoid potentially misleading autobuilder results where we expect it to download
+        use-all-platform-bundle: 'false'
-      # dependencies successfully, but they actually come from a warm cache
+    - name: Set environment variable for Swift enablement
-          cache: false
+      if: >-
-      - uses: ./../action/init
+        runner.os != 'Windows' && (
-        with:
+            matrix.version == '20220908' ||
-          languages: go
+            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
-          upload-database: false
+    - uses: actions/setup-go@v4
-      - shell: bash
+      with:
-        run: |
+        go-version: ~1.21.1
-          cd "$RUNNER_TEMP/codeql_databases"
+    - uses: ./../action/init
-          if [[ ! -d go ]]; then
+      with:
-            echo "Did not find a Go database"
+        languages: go
-            exit 1
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
-          fi
+    - uses: ./../action/analyze
+      with:
+        upload-database: false
+    - 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

@@ -11,40 +11,38 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   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:
       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: latest
+          version: latest
-          - os: macos-latest
+        - os: macos-latest
-            version: latest
+          version: latest
-          - os: windows-latest
+        - os: windows-latest
-            version: latest
+          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,88 +51,100 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
-          python-version: '3.11'
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-      - name: Init with registries
-        uses: ./../action/init
-        with:
-          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
+        matrix.version == 'stable-v2.13.5' ||
-        shell: bash
-        run: |
-          PRIVATE_PACK="$HOME/.codeql/packages/codeql-testing/private-pack"
-          CODEQL_PACK1="$HOME/.codeql/packages/codeql-testing/codeql-pack1"
 
-          if [[ -d $PRIVATE_PACK ]]
+        matrix.version == 'stable-v2.14.6')
-          then
+      with:
-              echo "$PRIVATE_PACK was installed."
+        python-version: '3.11'
-          else
+    - name: Check out repository
-              echo "::error $PRIVATE_PACK pack was not installed."
+      uses: actions/checkout@v4
-              exit 1
+    - name: Prepare test
-          fi
+      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
+    - name: Init with registries
+      uses: ./../action/init
+      with:
+        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 }}"
 
-          if [[ -d $CODEQL_PACK1 ]]
+    - name: Verify packages installed
-          then
+      shell: bash
-              echo "$CODEQL_PACK1 was installed."
+      run: |
-          else
+        PRIVATE_PACK="$HOME/.codeql/packages/codeql-testing/private-pack"
-              echo "::error $CODEQL_PACK1 pack was not installed."
+        CODEQL_PACK1="$HOME/.codeql/packages/codeql-testing/codeql-pack1"
-              exit 1
-          fi
 
-      - name: Verify qlconfig.yml file was created
+        if [[ -d $PRIVATE_PACK ]]
-        shell: bash
+        then
-        run: |
+            echo "$PRIVATE_PACK was installed."
-          QLCONFIG_PATH=$RUNNER_TEMP/qlconfig.yml
+        else
-          echo "Expected qlconfig.yml file to be created at $QLCONFIG_PATH"
+            echo "::error $PRIVATE_PACK pack was not installed."
-          if [[ -f $QLCONFIG_PATH ]]
+            exit 1
-          then
+        fi
-              echo "qlconfig.yml file was created."
-          else
-              echo "::error qlconfig.yml file was not created."
-              exit 1
-          fi
 
-      - name: Verify contents of qlconfig.yml
+        if [[ -d $CODEQL_PACK1 ]]
+        then
+            echo "$CODEQL_PACK1 was installed."
+        else
+            echo "::error $CODEQL_PACK1 pack was not installed."
+            exit 1
+        fi
+
+    - name: Verify qlconfig.yml file was created
+      shell: bash
+      run: |
+        QLCONFIG_PATH=$RUNNER_TEMP/qlconfig.yml
+        echo "Expected qlconfig.yml file to be created at $QLCONFIG_PATH"
+        if [[ -f $QLCONFIG_PATH ]]
+        then
+            echo "qlconfig.yml file was created."
+        else
+            echo "::error qlconfig.yml file was not created."
+            exit 1
+        fi
+
+    - 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

@@ -11,28 +11,26 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   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:
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: latest
+          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
@@ -40,48 +38,60 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
+
-          python-version: '3.11'
+        matrix.version == 'stable-v2.13.5' ||
-      - name: Check out repository
+
-        uses: actions/checkout@v4
+        matrix.version == 'stable-v2.14.6')
-      - name: Prepare test
+      with:
-        id: prepare-test
+        python-version: '3.11'
-        uses: ./.github/actions/prepare-test
+    - name: Check out repository
-        with:
+      uses: actions/checkout@v4
-          version: ${{ matrix.version }}
+    - name: Prepare test
-          use-all-platform-bundle: 'false'
+      id: prepare-test
-      - name: Move codeql-action
+      uses: ./.github/actions/prepare-test
-        shell: bash
+      with:
-        run: |
+        version: ${{ matrix.version }}
-          mkdir ../new-source-root
+        use-all-platform-bundle: 'false'
-          mv * ../new-source-root
+    - name: Set environment variable for Swift enablement
-      - uses: ./../action/init
+      if: >-
-        with:
+        runner.os != 'Windows' && (
-          languages: javascript
+            matrix.version == '20220908' ||
-          source-root: ../new-source-root
+            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
-          upload-database: false
+    - name: Move codeql-action
-          skip-queries: true
+      shell: bash
-          upload: never
+      run: |
-      - name: Assert database exists
+        mkdir ../new-source-root
-        shell: bash
+        mv * ../new-source-root
-        run: |
+    - uses: ./../action/init
-          cd "$RUNNER_TEMP/codeql_databases"
+      with:
-          if [[ ! -d javascript ]]; then
+        languages: javascript
-            echo "Did not find a JavaScript database"
+        source-root: ../new-source-root
-            exit 1
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
-          fi
+    - uses: ./../action/analyze
+      with:
+        upload-database: false
+        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/__language-aliases.yml

@@ -11,24 +11,22 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   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:
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: latest
+          version: latest
     name: Language aliases
     permissions:
       contents: read
@@ -36,40 +34,52 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
-          python-version: '3.11'
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-      - uses: ./../action/init
-        with:
-          languages: C#,java-kotlin,swift,typescript
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
 
-      - name: Check languages
+        matrix.version == 'stable-v2.13.5' ||
-        run: |
-          expected_languages="csharp,java,swift,javascript"
-          actual_languages=$(jq -r '.languages | join(",")' "$RUNNER_TEMP"/config)
 
-          if [ "$expected_languages" != "$actual_languages" ]; then
+        matrix.version == 'stable-v2.14.6')
-            echo "Resolved languages did not match expected list. " \
+      with:
-              "Expected languages: $expected_languages. Actual languages: $actual_languages."
+        python-version: '3.11'
-            exit 1
+    - name: Check out repository
-          fi
+      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
+      with:
+        languages: C#,java-kotlin,swift,typescript
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
+
+    - name: Check languages
+      run: |
+        expected_languages="csharp,java,swift,javascript"
+        actual_languages=$(jq -r '.languages | join(",")' "$RUNNER_TEMP"/config)
+
+        if [ "$expected_languages" != "$actual_languages" ]; then
+          echo "Resolved languages did not match expected list. " \
+            "Expected languages: $expected_languages. Actual languages: $actual_languages."
+          exit 1
+        fi
     env:
       CODEQL_ACTION_TEST_MODE: true

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

@@ -11,54 +11,52 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   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:
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-20230403
+          version: stable-20220908
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-20230403
+          version: stable-20220908
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.13.5
+          version: stable-20221211
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.13.5
+          version: stable-20221211
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.14.6
+          version: stable-20230418
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.14.6
+          version: stable-20230418
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.15.5
+          version: stable-v2.13.5
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.15.5
+          version: stable-v2.13.5
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.16.6
+          version: stable-v2.14.6
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.16.6
+          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: latest
+          version: latest
-          - os: macos-latest
+        - os: macos-latest
-            version: latest
+          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: Multi-language repository
     permissions:
       contents: read
@@ -66,92 +64,106 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
-          python-version: '3.11'
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-      - uses: ./../action/init
-        id: init
-        with:
-          db-location: ${{ runner.temp }}/customDbLocation
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
 
-      - uses: ./../action/.github/actions/setup-swift
+        matrix.version == 'stable-v2.13.5' ||
-        with:
-          codeql-path: ${{ steps.init.outputs.codeql-path }}
 
-      - name: Build code
+        matrix.version == 'stable-v2.14.6')
-        shell: bash
+      with:
-        run: ./build.sh
+        python-version: '3.11'
+    - name: Check out repository
+      uses: actions/checkout@v4
+    - name: Prepare test
+      id: prepare-test
+      uses: ./.github/actions/prepare-test
+      with:
+        version: ${{ matrix.version }}
+        use-all-platform-bundle: 'false'
+    - name: Set 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/analyze
+    - uses: ./../action/.github/actions/setup-swift
-        id: analysis
+      with:
-        with:
+        codeql-path: ${{ steps.init.outputs.codeql-path }}
-          upload-database: false
 
-      - name: Check language autodetect for all languages excluding Swift
+    - name: Build code
-        shell: bash
+      shell: bash
-        run: |
+      run: ./build.sh
-          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 Swift
+    - uses: ./../action/analyze
-        if: runner.os != 'Windows' && matrix.version != 'stable-20230403'
+      id: analysis
-        shell: bash
+      with:
-        run: |
+        upload-database: false
-          SWIFT_DB=${{ fromJson(steps.analysis.outputs.db-locations).swift }}
+
-          if [[ ! -d $SWIFT_DB ]] || [[ ! $SWIFT_DB == ${{ runner.temp }}/customDbLocation/* ]]; then
+    - name: Check language autodetect for all languages excluding Swift
-            echo "Did not create a database for Swift, or created it in the wrong location."
+      shell: bash
-            exit 1
+      run: |
-          fi
+        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 Swift
+      if: >-
+        env.CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT == 'true' || 
+            (runner.os != 'Windows' && matrix.version == 'nightly-latest')
+      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

@@ -11,40 +11,38 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   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:
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: latest
+          version: latest
-          - os: macos-latest
+        - os: macos-latest
-            version: latest
+          version: latest
-          - os: windows-latest
+        - os: windows-latest
-            version: latest
+          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
@@ -52,61 +50,75 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
-          python-version: '3.11'
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-      - uses: ./../action/init
-        with:
-          config-file: .github/codeql/codeql-config-packaging3.yml
-          packs: +codeql-testing/codeql-pack1@1.0.0
-          languages: javascript
-          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
+        matrix.version == 'stable-v2.13.5' ||
-        uses: ./../action/.github/actions/check-sarif
-        with:
-          sarif-file: ${{ runner.temp }}/results/javascript.sarif
-          queries-run: 
-            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
 
-      - name: Assert Results
+        matrix.version == 'stable-v2.14.6')
-        shell: bash
+      with:
-        run: |
+        python-version: '3.11'
-          cd "$RUNNER_TEMP/results"
+    - name: Check out repository
-          # We should have 4 hits from these rules
+      uses: actions/checkout@v4
-          EXPECTED_RULES="javascript/example/empty-or-one-block javascript/example/empty-or-one-block javascript/example/other-query-block javascript/example/two-block"
+    - 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
+      with:
+        config-file: .github/codeql/codeql-config-packaging3.yml
+        packs: +codeql-testing/codeql-pack1@1.0.0
+        languages: javascript
+        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
 
-          # use tr to replace newlines with spaces and xargs to trim leading and trailing whitespace
+    - name: Check results
-          RULES="$(cat javascript.sarif | jq -r '.runs[0].results[].ruleId' | sort | tr "\n\r" " " | xargs)"
+      uses: ./../action/.github/actions/check-sarif
-          echo "Found matching rules '$RULES'"
+      with:
-          if [ "$RULES" != "$EXPECTED_RULES" ]; then
+        sarif-file: ${{ runner.temp }}/results/javascript.sarif
-            echo "Did not match expected rules '$EXPECTED_RULES'."
+        queries-run: 
-            exit 1
+          javascript/example/empty-or-one-block,javascript/example/empty-or-one-block,javascript/example/other-query-block,javascript/example/two-block
-          fi
+        queries-not-run: foo,bar
+
+    - name: Assert Results
+      shell: bash
+      run: |
+        cd "$RUNNER_TEMP/results"
+        # 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"
+
+        # 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)"
+        echo "Found matching rules '$RULES'"
+        if [ "$RULES" != "$EXPECTED_RULES" ]; then
+          echo "Did not match expected rules '$EXPECTED_RULES'."
+          exit 1
+        fi
     env:
+      CODEQL_PASS_CONFIG_TO_CLI: true
+
       CODEQL_ACTION_TEST_MODE: true

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

@@ -11,40 +11,38 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   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:
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: latest
+          version: latest
-          - os: macos-latest
+        - os: macos-latest
-            version: latest
+          version: latest
-          - os: windows-latest
+        - os: windows-latest
-            version: latest
+          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
@@ -52,61 +50,73 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
-          python-version: '3.11'
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-      - uses: ./../action/init
-        with:
-          config-file: .github/codeql/codeql-config-packaging3.yml
-          packs: +codeql-testing/codeql-pack1@1.0.0
-          languages: javascript
-          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
+        matrix.version == 'stable-v2.13.5' ||
-        uses: ./../action/.github/actions/check-sarif
-        with:
-          sarif-file: ${{ runner.temp }}/results/javascript.sarif
-          queries-run: 
-            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
 
-      - name: Assert Results
+        matrix.version == 'stable-v2.14.6')
-        shell: bash
+      with:
-        run: |
+        python-version: '3.11'
-          cd "$RUNNER_TEMP/results"
+    - name: Check out repository
-          # We should have 4 hits from these rules
+      uses: actions/checkout@v4
-          EXPECTED_RULES="javascript/example/empty-or-one-block javascript/example/empty-or-one-block javascript/example/other-query-block javascript/example/two-block"
+    - 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
+      with:
+        config-file: .github/codeql/codeql-config-packaging3.yml
+        packs: +codeql-testing/codeql-pack1@1.0.0
+        languages: javascript
+        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
 
-          # use tr to replace newlines with spaces and xargs to trim leading and trailing whitespace
+    - name: Check results
-          RULES="$(cat javascript.sarif | jq -r '.runs[0].results[].ruleId' | sort | tr "\n\r" " " | xargs)"
+      uses: ./../action/.github/actions/check-sarif
-          echo "Found matching rules '$RULES'"
+      with:
-          if [ "$RULES" != "$EXPECTED_RULES" ]; then
+        sarif-file: ${{ runner.temp }}/results/javascript.sarif
-            echo "Did not match expected rules '$EXPECTED_RULES'."
+        queries-run: 
-            exit 1
+          javascript/example/empty-or-one-block,javascript/example/empty-or-one-block,javascript/example/other-query-block,javascript/example/two-block
-          fi
+        queries-not-run: foo,bar
+
+    - name: Assert Results
+      shell: bash
+      run: |
+        cd "$RUNNER_TEMP/results"
+        # 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"
+
+        # 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)"
+        echo "Found matching rules '$RULES'"
+        if [ "$RULES" != "$EXPECTED_RULES" ]; then
+          echo "Did not match expected rules '$EXPECTED_RULES'."
+          exit 1
+        fi
     env:
       CODEQL_ACTION_TEST_MODE: true

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

@@ -11,40 +11,38 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   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:
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: latest
+          version: latest
-          - os: macos-latest
+        - os: macos-latest
-            version: latest
+          version: latest
-          - os: windows-latest
+        - os: windows-latest
-            version: latest
+          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
@@ -52,60 +50,72 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
-          python-version: '3.11'
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-      - uses: ./../action/init
-        with:
-          config-file: .github/codeql/codeql-config-packaging.yml
-          languages: javascript
-          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
+        matrix.version == 'stable-v2.13.5' ||
-        uses: ./../action/.github/actions/check-sarif
-        with:
-          sarif-file: ${{ runner.temp }}/results/javascript.sarif
-          queries-run: 
-            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
 
-      - name: Assert Results
+        matrix.version == 'stable-v2.14.6')
-        shell: bash
+      with:
-        run: |
+        python-version: '3.11'
-          cd "$RUNNER_TEMP/results"
+    - name: Check out repository
-          # We should have 4 hits from these rules
+      uses: actions/checkout@v4
-          EXPECTED_RULES="javascript/example/empty-or-one-block javascript/example/empty-or-one-block javascript/example/other-query-block javascript/example/two-block"
+    - 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
+      with:
+        config-file: .github/codeql/codeql-config-packaging.yml
+        languages: javascript
+        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
 
-          # use tr to replace newlines with spaces and xargs to trim leading and trailing whitespace
+    - name: Check results
-          RULES="$(cat javascript.sarif | jq -r '.runs[0].results[].ruleId' | sort | tr "\n\r" " " | xargs)"
+      uses: ./../action/.github/actions/check-sarif
-          echo "Found matching rules '$RULES'"
+      with:
-          if [ "$RULES" != "$EXPECTED_RULES" ]; then
+        sarif-file: ${{ runner.temp }}/results/javascript.sarif
-            echo "Did not match expected rules '$EXPECTED_RULES'."
+        queries-run: 
-            exit 1
+          javascript/example/empty-or-one-block,javascript/example/empty-or-one-block,javascript/example/other-query-block,javascript/example/two-block
-          fi
+        queries-not-run: foo,bar
+
+    - name: Assert Results
+      shell: bash
+      run: |
+        cd "$RUNNER_TEMP/results"
+        # 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"
+
+        # 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)"
+        echo "Found matching rules '$RULES'"
+        if [ "$RULES" != "$EXPECTED_RULES" ]; then
+          echo "Did not match expected rules '$EXPECTED_RULES'."
+          exit 1
+        fi
     env:
       CODEQL_ACTION_TEST_MODE: true

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

@@ -11,40 +11,38 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   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:
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: latest
+          version: latest
-          - os: macos-latest
+        - os: macos-latest
-            version: latest
+          version: latest
-          - os: windows-latest
+        - os: windows-latest
-            version: latest
+          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
@@ -52,60 +50,72 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
-          python-version: '3.11'
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-      - uses: ./../action/init
-        with:
-          config-file: .github/codeql/codeql-config-packaging2.yml
-          languages: javascript
-          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
+        matrix.version == 'stable-v2.13.5' ||
-        uses: ./../action/.github/actions/check-sarif
-        with:
-          sarif-file: ${{ runner.temp }}/results/javascript.sarif
-          queries-run: 
-            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
 
-      - name: Assert Results
+        matrix.version == 'stable-v2.14.6')
-        shell: bash
+      with:
-        run: |
+        python-version: '3.11'
-          cd "$RUNNER_TEMP/results"
+    - name: Check out repository
-          # We should have 4 hits from these rules
+      uses: actions/checkout@v4
-          EXPECTED_RULES="javascript/example/empty-or-one-block javascript/example/empty-or-one-block javascript/example/other-query-block javascript/example/two-block"
+    - 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
+      with:
+        config-file: .github/codeql/codeql-config-packaging2.yml
+        languages: javascript
+        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
 
-          # use tr to replace newlines with spaces and xargs to trim leading and trailing whitespace
+    - name: Check results
-          RULES="$(cat javascript.sarif | jq -r '.runs[0].results[].ruleId' | sort | tr "\n\r" " " | xargs)"
+      uses: ./../action/.github/actions/check-sarif
-          echo "Found matching rules '$RULES'"
+      with:
-          if [ "$RULES" != "$EXPECTED_RULES" ]; then
+        sarif-file: ${{ runner.temp }}/results/javascript.sarif
-            echo "Did not match expected rules '$EXPECTED_RULES'."
+        queries-run: 
-            exit 1
+          javascript/example/empty-or-one-block,javascript/example/empty-or-one-block,javascript/example/other-query-block,javascript/example/two-block
-          fi
+        queries-not-run: foo,bar
+
+    - name: Assert Results
+      shell: bash
+      run: |
+        cd "$RUNNER_TEMP/results"
+        # 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"
+
+        # 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)"
+        echo "Found matching rules '$RULES'"
+        if [ "$RULES" != "$EXPECTED_RULES" ]; then
+          echo "Did not match expected rules '$EXPECTED_RULES'."
+          exit 1
+        fi
     env:
       CODEQL_ACTION_TEST_MODE: true

.github/workflows/__remote-config.yml

@@ -11,70 +11,68 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   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:
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-20230403
+          version: stable-20220908
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-20230403
+          version: stable-20220908
-          - os: windows-latest
+        - os: windows-latest
-            version: stable-20230403
+          version: stable-20220908
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.13.5
+          version: stable-20221211
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.13.5
+          version: stable-20221211
-          - os: windows-latest
+        - os: windows-latest
-            version: stable-v2.13.5
+          version: stable-20221211
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.14.6
+          version: stable-20230418
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.14.6
+          version: stable-20230418
-          - os: windows-latest
+        - os: windows-latest
-            version: stable-v2.14.6
+          version: stable-20230418
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.15.5
+          version: stable-v2.13.5
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.15.5
+          version: stable-v2.13.5
-          - os: windows-latest
+        - os: windows-latest
-            version: stable-v2.15.5
+          version: stable-v2.13.5
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.16.6
+          version: stable-v2.14.6
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.16.6
+          version: stable-v2.14.6
-          - os: windows-latest
+        - os: windows-latest
-            version: stable-v2.16.6
+          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: windows-latest
+        - os: windows-latest
-            version: default
+          version: default
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: latest
+          version: latest
-          - os: macos-latest
+        - os: macos-latest
-            version: latest
+          version: latest
-          - os: windows-latest
+        - os: windows-latest
-            version: latest
+          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: Remote config file
     permissions:
       contents: read
@@ -82,35 +80,47 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
+
-          python-version: '3.11'
+        matrix.version == 'stable-v2.13.5' ||
-      - name: Check out repository
+
-        uses: actions/checkout@v4
+        matrix.version == 'stable-v2.14.6')
-      - name: Prepare test
+      with:
-        id: prepare-test
+        python-version: '3.11'
-        uses: ./.github/actions/prepare-test
+    - name: Check out repository
-        with:
+      uses: actions/checkout@v4
-          version: ${{ matrix.version }}
+    - name: Prepare test
-          use-all-platform-bundle: 'false'
+      id: prepare-test
-      - uses: ./../action/init
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+        version: ${{ matrix.version }}
-          languages: cpp,csharp,java,javascript,python
+        use-all-platform-bundle: 'false'
-          config-file: ${{ github.repository }}/tests/multi-language-repo/.github/codeql/custom-queries.yml@${{
+    - name: Set environment variable for Swift enablement
-            github.sha }}
+      if: >-
-      - name: Build code
+        runner.os != 'Windows' && (
-        shell: bash
+            matrix.version == '20220908' ||
-        run: ./build.sh
+            matrix.version == '20221211'
-      - uses: ./../action/analyze
+        )
+      shell: bash
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
+    - uses: ./../action/init
+      with:
+        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

@@ -11,46 +11,44 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   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:
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.13.4
+          version: stable-v2.13.4
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.13.4
+          version: stable-v2.13.4
-          - os: windows-latest
+        - os: windows-latest
-            version: stable-v2.13.4
+          version: stable-v2.13.4
-          - 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: latest
+          version: latest
-          - os: macos-latest
+        - os: macos-latest
-            version: latest
+          version: latest
-          - os: windows-latest
+        - os: windows-latest
-            version: latest
+          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: Resolve environment
     permissions:
       contents: read
@@ -58,52 +56,64 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
-          python-version: '3.11'
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-      - 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
+        matrix.version == 'stable-v2.13.5' ||
-        uses: ./../action/resolve-environment
-        id: resolve-environment-go
-        with:
-          language: go
 
-      - name: Fail if Go configuration missing
+        matrix.version == 'stable-v2.14.6')
-        if: (!fromJSON(steps.resolve-environment-go.outputs.environment).configuration.go)
+      with:
-        run: exit 1
+        python-version: '3.11'
+    - name: Check out repository
+      uses: actions/checkout@v4
+    - name: Prepare test
+      id: prepare-test
+      uses: ./.github/actions/prepare-test
+      with:
+        version: ${{ matrix.version }}
+        use-all-platform-bundle: 'false'
+    - name: Set 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
+      with:
+        languages: ${{ matrix.version == 'stable-v2.13.4' && 'go' || 'go,javascript-typescript'
+          }}
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
 
-      - name: Resolve environment for JavaScript/TypeScript
+    - name: Resolve environment for Go
-        if: matrix.version != 'stable-v2.13.4'
+      uses: ./../action/resolve-environment
-        uses: ./../action/resolve-environment
+      id: resolve-environment-go
-        id: resolve-environment-js
+      with:
-        with:
+        language: go
-          language: javascript-typescript
 
-      - name: Fail if JavaScript/TypeScript configuration present
+    - name: Fail if Go configuration missing
-        if: matrix.version != 'stable-v2.13.4' && 
+      if: (!fromJSON(steps.resolve-environment-go.outputs.environment).configuration.go)
-          fromJSON(steps.resolve-environment-js.outputs.environment).configuration.javascript
+      run: exit 1
-        run: exit 1
+
+    - name: Resolve environment for JavaScript/TypeScript
+      if: matrix.version != 'stable-v2.13.4'
+      uses: ./../action/resolve-environment
+      id: resolve-environment-js
+      with:
+        language: javascript-typescript
+
+    - name: Fail if JavaScript/TypeScript configuration present
+      if: matrix.version != 'stable-v2.13.4' && 
+        fromJSON(steps.resolve-environment-js.outputs.environment).configuration.javascript
+      run: exit 1
     env:
       CODEQL_ACTION_TEST_MODE: true

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

@@ -11,24 +11,22 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   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:
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: default
+          version: default
     name: RuboCop multi-language
     permissions:
       contents: read
@@ -36,45 +34,57 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
+
-          python-version: '3.11'
+        matrix.version == 'stable-v2.13.5' ||
-      - name: Check out repository
+
-        uses: actions/checkout@v4
+        matrix.version == 'stable-v2.14.6')
-      - name: Prepare test
+      with:
-        id: prepare-test
+        python-version: '3.11'
-        uses: ./.github/actions/prepare-test
+    - name: Check out repository
-        with:
+      uses: actions/checkout@v4
-          version: ${{ matrix.version }}
+    - name: Prepare test
-          use-all-platform-bundle: 'false'
+      id: prepare-test
-      - name: Set up Ruby
+      uses: ./.github/actions/prepare-test
-        uses: ruby/setup-ruby@v1
+      with:
-        with:
+        version: ${{ matrix.version }}
-          ruby-version: 2.6
+        use-all-platform-bundle: 'false'
-      - name: Install Code Scanning integration
+    - name: Set environment variable for Swift enablement
-        shell: bash
+      if: >-
-        run: bundle add code-scanning-rubocop --version 0.3.0 --skip-install
+        runner.os != 'Windows' && (
-      - name: Install dependencies
+            matrix.version == '20220908' ||
-        shell: bash
+            matrix.version == '20221211'
-        run: bundle install
+        )
-      - name: RuboCop run
+      shell: bash
-        shell: bash
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-        run: |
+    - name: Set up Ruby
-          bash -c "
+      uses: ruby/setup-ruby@v1
-            bundle exec rubocop --require code_scanning --format CodeScanning::SarifFormatter -o rubocop.sarif
+      with:
-            [[ $? -ne 2 ]]
+        ruby-version: 2.6
-          "
+    - name: Install Code Scanning integration
-      - uses: ./../action/upload-sarif
+      shell: bash
-        with:
+      run: bundle add code-scanning-rubocop --version 0.3.0 --skip-install
-          sarif_file: rubocop.sarif
+    - name: Install dependencies
+      shell: bash
+      run: bundle install
+    - name: RuboCop run
+      shell: bash
+      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

@@ -11,34 +11,32 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   ruby:
     strategy:
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: latest
+          version: latest
-          - os: macos-latest
+        - os: macos-latest
-            version: latest
+          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
@@ -46,41 +44,53 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
+
-          python-version: '3.11'
+        matrix.version == 'stable-v2.13.5' ||
-      - name: Check out repository
+
-        uses: actions/checkout@v4
+        matrix.version == 'stable-v2.14.6')
-      - name: Prepare test
+      with:
-        id: prepare-test
+        python-version: '3.11'
-        uses: ./.github/actions/prepare-test
+    - name: Check out repository
-        with:
+      uses: actions/checkout@v4
-          version: ${{ matrix.version }}
+    - name: Prepare test
-          use-all-platform-bundle: 'false'
+      id: prepare-test
-      - uses: ./../action/init
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          languages: ruby
+        version: ${{ matrix.version }}
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+        use-all-platform-bundle: 'false'
-      - uses: ./../action/analyze
+    - name: Set environment variable for Swift enablement
-        id: analysis
+      if: >-
-        with:
+        runner.os != 'Windows' && (
-          upload-database: false
+            matrix.version == '20220908' ||
-      - name: Check database
+            matrix.version == '20221211'
-        shell: bash
+        )
-        run: |
+      shell: bash
-          RUBY_DB="${{ fromJson(steps.analysis.outputs.db-locations).ruby }}"
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-          if [[ ! -d "$RUBY_DB" ]]; then
+    - uses: ./../action/init
-            echo "Did not create a database for Ruby."
+      with:
-            exit 1
+        languages: ruby
-          fi
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
+    - uses: ./../action/analyze
+      id: analysis
+      with:
+        upload-database: false
+    - 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/__scaling-reserved-ram.yml

@@ -11,54 +11,52 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   pull_request:
     types:
-      - opened
+    - opened
-      - synchronize
+    - synchronize
-      - reopened
+    - reopened
-      - ready_for_review
+    - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   scaling-reserved-ram:
     strategy:
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-20230403
+          version: stable-20220908
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-20230403
+          version: stable-20220908
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.13.5
+          version: stable-20221211
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.13.5
+          version: stable-20221211
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.14.6
+          version: stable-20230418
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.14.6
+          version: stable-20230418
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.15.5
+          version: stable-v2.13.5
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.15.5
+          version: stable-v2.13.5
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.16.6
+          version: stable-v2.14.6
-          - os: macos-latest
+        - os: macos-latest
-            version: stable-v2.16.6
+          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: latest
+          version: latest
-          - os: macos-latest
+        - os: macos-latest
-            version: latest
+          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: Scaling reserved RAM
     permissions:
       contents: read
@@ -66,44 +64,56 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
-          python-version: '3.11'
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-      - uses: ./../action/init
-        id: init
-        with:
-          db-location: ${{ runner.temp }}/customDbLocation
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
 
-      - uses: ./../action/.github/actions/setup-swift
+        matrix.version == 'stable-v2.13.5' ||
-        with:
-          codeql-path: ${{ steps.init.outputs.codeql-path }}
 
-      - name: Build code
+        matrix.version == 'stable-v2.14.6')
-        shell: bash
+      with:
-        run: ./build.sh
+        python-version: '3.11'
+    - name: Check out repository
+      uses: actions/checkout@v4
+    - name: Prepare test
+      id: prepare-test
+      uses: ./.github/actions/prepare-test
+      with:
+        version: ${{ matrix.version }}
+        use-all-platform-bundle: 'false'
+    - name: Set 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/analyze
+    - uses: ./../action/.github/actions/setup-swift
-        id: analysis
+      with:
-        with:
+        codeql-path: ${{ steps.init.outputs.codeql-path }}
-          upload-database: false
+
+    - 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

@@ -11,34 +11,32 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   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:
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: latest
+          version: latest
-          - os: macos-latest
+        - os: macos-latest
-            version: latest
+          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
@@ -46,65 +44,77 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
-          python-version: '3.11'
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Prepare test
-        id: prepare-test
-        uses: ./.github/actions/prepare-test
-        with:
-          version: ${{ matrix.version }}
-          use-all-platform-bundle: 'false'
-      - uses: ./../action/init
-        with:
-          config-file: .github/codeql/codeql-config-packaging3.yml
-          packs: +codeql-testing/codeql-pack1@1.0.0
-          languages: javascript
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
-      - 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
+        matrix.version == 'stable-v2.13.5' ||
-        shell: bash
-        run: |
-          if [ "$(ls -A $RUNNER_TEMP/results)" ]; then
-            echo "Expected results directory to be empty after skipping query execution!"
-            exit 1
-          fi
-      - uses: ./../action/analyze
-        with:
-          output: ${{ runner.temp }}/results
-          upload-database: false
-      - name: Assert Results
-        shell: bash
-        run: |
-          cd "$RUNNER_TEMP/results"
-          # 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"
 
-          # use tr to replace newlines with spaces and xargs to trim leading and trailing whitespace
+        matrix.version == 'stable-v2.14.6')
-          RULES="$(cat javascript.sarif | jq -r '.runs[0].results[].ruleId' | sort | tr "\n\r" " " | xargs)"
+      with:
-          echo "Found matching rules '$RULES'"
+        python-version: '3.11'
-          if [ "$RULES" != "$EXPECTED_RULES" ]; then
+    - name: Check out repository
-            echo "Did not match expected rules '$EXPECTED_RULES'."
+      uses: actions/checkout@v4
-            exit 1
+    - name: Prepare test
-          fi
+      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
+      with:
+        config-file: .github/codeql/codeql-config-packaging3.yml
+        packs: +codeql-testing/codeql-pack1@1.0.0
+        languages: javascript
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
+    - 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
+      shell: bash
+      run: |
+        if [ "$(ls -A $RUNNER_TEMP/results)" ]; then
+          echo "Expected results directory to be empty after skipping query execution!"
+          exit 1
+        fi
+    - uses: ./../action/analyze
+      with:
+        output: ${{ runner.temp }}/results
+        upload-database: false
+    - name: Assert Results
+      shell: bash
+      run: |
+        cd "$RUNNER_TEMP/results"
+        # 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"
+
+        # 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)"
+        echo "Found matching rules '$RULES'"
+        if [ "$RULES" != "$EXPECTED_RULES" ]; then
+          echo "Did not match expected rules '$EXPECTED_RULES'."
+          exit 1
+        fi
     env:
       CODEQL_ACTION_TEST_MODE: true

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

@@ -11,28 +11,26 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   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:
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: latest
+          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
@@ -40,43 +38,55 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
+
-          python-version: '3.11'
+        matrix.version == 'stable-v2.13.5' ||
-      - name: Check out repository
+
-        uses: actions/checkout@v4
+        matrix.version == 'stable-v2.14.6')
-      - name: Prepare test
+      with:
-        id: prepare-test
+        python-version: '3.11'
-        uses: ./.github/actions/prepare-test
+    - name: Check out repository
-        with:
+      uses: actions/checkout@v4
-          version: ${{ matrix.version }}
+    - name: Prepare test
-          use-all-platform-bundle: 'false'
+      id: prepare-test
-      - uses: actions/checkout@v4
+      uses: ./.github/actions/prepare-test
-      - uses: ./init
+      with:
-        with:
+        version: ${{ matrix.version }}
-          languages: javascript
+        use-all-platform-bundle: 'false'
-      - name: Fail
+    - 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: 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-custom-build.yml

@@ -11,34 +11,32 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   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:
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: latest
+          version: latest
-          - os: macos-latest
+        - os: macos-latest
-            version: latest
+          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: Swift analysis using a custom build command
     permissions:
       contents: read
@@ -46,52 +44,64 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
+
-          python-version: '3.11'
+        matrix.version == 'stable-v2.13.5' ||
-      - name: Check out repository
+
-        uses: actions/checkout@v4
+        matrix.version == 'stable-v2.14.6')
-      - name: Prepare test
+      with:
-        id: prepare-test
+        python-version: '3.11'
-        uses: ./.github/actions/prepare-test
+    - name: Check out repository
-        with:
+      uses: actions/checkout@v4
-          version: ${{ matrix.version }}
+    - name: Prepare test
-          use-all-platform-bundle: 'false'
+      id: prepare-test
-      - uses: ./../action/init
+      uses: ./.github/actions/prepare-test
-        id: init
+      with:
-        with:
+        version: ${{ matrix.version }}
-          languages: swift
+        use-all-platform-bundle: 'false'
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+    - name: Set environment variable for Swift enablement
-      - uses: ./../action/.github/actions/setup-swift
+      if: >-
-        with:
+        runner.os != 'Windows' && (
-          codeql-path: ${{steps.init.outputs.codeql-path}}
+            matrix.version == '20220908' ||
-      - name: Check working directory
+            matrix.version == '20221211'
-        shell: bash
+        )
-        run: pwd
+      shell: bash
-      - name: Build code
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-        shell: bash
+    - uses: ./../action/init
-        run: ./build.sh
+      id: init
-      - uses: ./../action/analyze
+      with:
-        id: analysis
+        languages: swift
-        with:
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
-          upload-database: false
+    - uses: ./../action/.github/actions/setup-swift
-      - name: Check database
+      with:
-        shell: bash
+        codeql-path: ${{steps.init.outputs.codeql-path}}
-        run: |
+    - name: Check working directory
-          SWIFT_DB="${{ fromJson(steps.analysis.outputs.db-locations).swift }}"
+      shell: bash
-          if [[ ! -d "$SWIFT_DB" ]]; then
+      run: pwd
-            echo "Did not create a database for Swift."
+    - name: Build code
-            exit 1
+      shell: bash
-          fi
+      run: ./build.sh
+    - 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:
       DOTNET_GENERATE_ASPNET_CERTIFICATE: 'false'
       CODEQL_ACTION_TEST_MODE: true

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

@@ -11,24 +11,22 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   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:
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: latest
+          version: latest
     name: Autobuild working directory
     permissions:
       contents: read
@@ -36,50 +34,62 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
+
-          python-version: '3.11'
+        matrix.version == 'stable-v2.13.5' ||
-      - name: Check out repository
+
-        uses: actions/checkout@v4
+        matrix.version == 'stable-v2.14.6')
-      - name: Prepare test
+      with:
-        id: prepare-test
+        python-version: '3.11'
-        uses: ./.github/actions/prepare-test
+    - name: Check out repository
-        with:
+      uses: actions/checkout@v4
-          version: ${{ matrix.version }}
+    - name: Prepare test
-          use-all-platform-bundle: 'false'
+      id: prepare-test
-      - name: Test setup
+      uses: ./.github/actions/prepare-test
-        shell: bash
+      with:
-        run: |
+        version: ${{ matrix.version }}
-          # Make sure that Gradle build succeeds in autobuild-dir ...
+        use-all-platform-bundle: 'false'
-          cp -a ../action/tests/java-repo autobuild-dir
+    - name: Set environment variable for Swift enablement
-          # ... and fails if attempted in the current directory
+      if: >-
-          echo > build.gradle
+        runner.os != 'Windows' && (
-      - uses: ./../action/init
+            matrix.version == '20220908' ||
-        with:
+            matrix.version == '20221211'
-          languages: java
+        )
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+      shell: bash
-      - uses: ./../action/autobuild
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-        with:
+    - name: Test setup
-          working-directory: autobuild-dir
+      shell: bash
-      - uses: ./../action/analyze
+      run: |
-        with:
+        # Make sure that Gradle build succeeds in autobuild-dir ...
-          upload-database: false
+        cp -a ../action/tests/java-repo autobuild-dir
-      - name: Check database
+        # ... and fails if attempted in the current directory
-        shell: bash
+        echo > build.gradle
-        run: |
+    - uses: ./../action/init
-          cd "$RUNNER_TEMP/codeql_databases"
+      with:
-          if [[ ! -d java ]]; then
+        languages: java
-            echo "Did not find a Java database"
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
-            exit 1
+    - uses: ./../action/autobuild
-          fi
+      with:
+        working-directory: autobuild-dir
+    - uses: ./../action/analyze
+      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

@@ -11,24 +11,22 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   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:
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: nightly-latest
+          version: nightly-latest
     name: Local CodeQL bundle
     permissions:
       contents: read
@@ -36,44 +34,56 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
+
-          python-version: '3.11'
+        matrix.version == 'stable-v2.13.5' ||
-      - name: Check out repository
+
-        uses: actions/checkout@v4
+        matrix.version == 'stable-v2.14.6')
-      - name: Prepare test
+      with:
-        id: prepare-test
+        python-version: '3.11'
-        uses: ./.github/actions/prepare-test
+    - name: Check out repository
-        with:
+      uses: actions/checkout@v4
-          version: ${{ matrix.version }}
+    - name: Prepare test
-          use-all-platform-bundle: 'false'
+      id: prepare-test
-      - name: Fetch a CodeQL bundle
+      uses: ./.github/actions/prepare-test
-        shell: bash
+      with:
-        env:
+        version: ${{ matrix.version }}
-          CODEQL_URL: ${{ steps.prepare-test.outputs.tools-url }}
+        use-all-platform-bundle: 'false'
-        run: |
+    - name: Set environment variable for Swift enablement
-          wget "$CODEQL_URL"
+      if: >-
-      - id: init
+        runner.os != 'Windows' && (
-        uses: ./../action/init
+            matrix.version == '20220908' ||
-        with:
+            matrix.version == '20221211'
-          tools: ./codeql-bundle-linux64.tar.gz
+        )
-      - 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 }}
+    - name: Fetch a CodeQL bundle
-      - name: Build code
+      shell: bash
-        shell: bash
+      env:
-        run: ./build.sh
+        CODEQL_URL: ${{ steps.prepare-test.outputs.tools-url }}
-      - uses: ./../action/analyze
+      run: |
-        with:
+        wget "$CODEQL_URL"
-          upload-database: false
+    - id: init
+      uses: ./../action/init
+      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

@@ -11,24 +11,22 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   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:
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: latest
+          version: latest
     name: Proxy test
     permissions:
       contents: read
@@ -36,33 +34,45 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
+
-          python-version: '3.11'
+        matrix.version == 'stable-v2.13.5' ||
-      - name: Check out repository
+
-        uses: actions/checkout@v4
+        matrix.version == 'stable-v2.14.6')
-      - name: Prepare test
+      with:
-        id: prepare-test
+        python-version: '3.11'
-        uses: ./.github/actions/prepare-test
+    - name: Check out repository
-        with:
+      uses: actions/checkout@v4
-          version: ${{ matrix.version }}
+    - name: Prepare test
-          use-all-platform-bundle: 'false'
+      id: prepare-test
-      - uses: ./../action/init
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          languages: javascript
+        version: ${{ matrix.version }}
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+        use-all-platform-bundle: 'false'
-      - uses: ./../action/analyze
+    - name: Set environment variable for Swift enablement
-        with:
+      if: >-
-          upload-database: false
+        runner.os != 'Windows' && (
+            matrix.version == '20220908' ||
+            matrix.version == '20221211'
+        )
+      shell: bash
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
+    - uses: ./../action/init
+      with:
+        languages: javascript
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
+    - uses: ./../action/analyze
+      with:
+        upload-database: false
     env:
       https_proxy: http://squid-proxy:3128
       CODEQL_ACTION_TEST_MODE: true
@@ -73,4 +83,4 @@ jobs:
       squid-proxy:
         image: ubuntu/squid:latest
         ports:
-          - 3128:3128
+        - 3128:3128

.github/workflows/__unset-environment.yml

@@ -11,38 +11,36 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   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:
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-20230403
+          version: stable-20220908
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.13.5
+          version: stable-20221211
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.14.6
+          version: stable-20230418
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.15.5
+          version: stable-v2.13.5
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: stable-v2.16.6
+          version: stable-v2.14.6
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: default
+          version: default
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: latest
+          version: latest
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: nightly-latest
+          version: nightly-latest
     name: Test unsetting environment variables
     permissions:
       contents: read
@@ -50,81 +48,93 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
+
-          python-version: '3.11'
+        matrix.version == 'stable-v2.13.5' ||
-      - name: Check out repository
+
-        uses: actions/checkout@v4
+        matrix.version == 'stable-v2.14.6')
-      - name: Prepare test
+      with:
-        id: prepare-test
+        python-version: '3.11'
-        uses: ./.github/actions/prepare-test
+    - name: Check out repository
-        with:
+      uses: actions/checkout@v4
-          version: ${{ matrix.version }}
+    - name: Prepare test
-          use-all-platform-bundle: 'false'
+      id: prepare-test
-      - uses: ./../action/init
+      uses: ./.github/actions/prepare-test
-        id: init
+      with:
-        with:
+        version: ${{ matrix.version }}
-          db-location: ${{ runner.temp }}/customDbLocation
+        use-all-platform-bundle: 'false'
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+    - name: Set environment variable for Swift enablement
-      - uses: ./../action/.github/actions/setup-swift
+      if: >-
-        with:
+        runner.os != 'Windows' && (
-          codeql-path: ${{ steps.init.outputs.codeql-path }}
+            matrix.version == '20220908' ||
-      - name: Build code
+            matrix.version == '20221211'
-        shell: bash
+        )
+      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
     # Disable Kotlin analysis while it's incompatible with Kotlin 1.8, until we find a
     # workaround for our PR checks.
-        run: env -i CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN=true PATH="$PATH" HOME="$HOME"
+      run: env -i CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN=true PATH="$PATH" HOME="$HOME"
-          ./build.sh
+        ./build.sh
-      - uses: ./../action/analyze
+    - uses: ./../action/analyze
-        id: analysis
+      id: analysis
-        with:
+      with:
-          upload-database: false
+        upload-database: false
-      - shell: bash
+    - shell: bash
-        run: |
+      run: |
-          CPP_DB="${{ fromJson(steps.analysis.outputs.db-locations).cpp }}"
+        CPP_DB="${{ fromJson(steps.analysis.outputs.db-locations).cpp }}"
-          if [[ ! -d "$CPP_DB" ]] || [[ ! "$CPP_DB" == "${RUNNER_TEMP}/customDbLocation/cpp" ]]; then
+        if [[ ! -d "$CPP_DB" ]] || [[ ! "$CPP_DB" == "${RUNNER_TEMP}/customDbLocation/cpp" ]]; then
-            echo "::error::Did not create a database for CPP, or created it in the wrong location." \
+          echo "::error::Did not create a database for CPP, or created it in the wrong location." \
-              "Expected location was '${RUNNER_TEMP}/customDbLocation/cpp' but actual was '${CPP_DB}'"
+            "Expected location was '${RUNNER_TEMP}/customDbLocation/cpp' but actual was '${CPP_DB}'"
-            exit 1
+          exit 1
-          fi
+        fi
-          CSHARP_DB="${{ fromJson(steps.analysis.outputs.db-locations).csharp }}"
+        CSHARP_DB="${{ fromJson(steps.analysis.outputs.db-locations).csharp }}"
-          if [[ ! -d "$CSHARP_DB" ]] || [[ ! "$CSHARP_DB" == "${RUNNER_TEMP}/customDbLocation/csharp" ]]; then
+        if [[ ! -d "$CSHARP_DB" ]] || [[ ! "$CSHARP_DB" == "${RUNNER_TEMP}/customDbLocation/csharp" ]]; then
-            echo "::error::Did not create a database for C Sharp, or created it in the wrong location." \
+          echo "::error::Did not create a database for C Sharp, or created it in the wrong location." \
-              "Expected location was '${RUNNER_TEMP}/customDbLocation/csharp' but actual was '${CSHARP_DB}'"
+            "Expected location was '${RUNNER_TEMP}/customDbLocation/csharp' but actual was '${CSHARP_DB}'"
-            exit 1
+          exit 1
-          fi
+        fi
-          GO_DB="${{ fromJson(steps.analysis.outputs.db-locations).go }}"
+        GO_DB="${{ fromJson(steps.analysis.outputs.db-locations).go }}"
-          if [[ ! -d "$GO_DB" ]] || [[ ! "$GO_DB" == "${RUNNER_TEMP}/customDbLocation/go" ]]; then
+        if [[ ! -d "$GO_DB" ]] || [[ ! "$GO_DB" == "${RUNNER_TEMP}/customDbLocation/go" ]]; then
-            echo "::error::Did not create a database for Go, or created it in the wrong location." \
+          echo "::error::Did not create a database for Go, or created it in the wrong location." \
-              "Expected location was '${RUNNER_TEMP}/customDbLocation/go' but actual was '${GO_DB}'"
+            "Expected location was '${RUNNER_TEMP}/customDbLocation/go' but actual was '${GO_DB}'"
-            exit 1
+          exit 1
-          fi
+        fi
-          JAVA_DB="${{ fromJson(steps.analysis.outputs.db-locations).java }}"
+        JAVA_DB="${{ fromJson(steps.analysis.outputs.db-locations).java }}"
-          if [[ ! -d "$JAVA_DB" ]] || [[ ! "$JAVA_DB" == "${RUNNER_TEMP}/customDbLocation/java" ]]; then
+        if [[ ! -d "$JAVA_DB" ]] || [[ ! "$JAVA_DB" == "${RUNNER_TEMP}/customDbLocation/java" ]]; then
-            echo "::error::Did not create a database for Java, or created it in the wrong location." \
+          echo "::error::Did not create a database for Java, or created it in the wrong location." \
-              "Expected location was '${RUNNER_TEMP}/customDbLocation/java' but actual was '${JAVA_DB}'"
+            "Expected location was '${RUNNER_TEMP}/customDbLocation/java' but actual was '${JAVA_DB}'"
-            exit 1
+          exit 1
-          fi
+        fi
-          JAVASCRIPT_DB="${{ fromJson(steps.analysis.outputs.db-locations).javascript }}"
+        JAVASCRIPT_DB="${{ fromJson(steps.analysis.outputs.db-locations).javascript }}"
-          if [[ ! -d "$JAVASCRIPT_DB" ]] || [[ ! "$JAVASCRIPT_DB" == "${RUNNER_TEMP}/customDbLocation/javascript" ]]; then
+        if [[ ! -d "$JAVASCRIPT_DB" ]] || [[ ! "$JAVASCRIPT_DB" == "${RUNNER_TEMP}/customDbLocation/javascript" ]]; then
-            echo "::error::Did not create a database for Javascript, or created it in the wrong location." \
+          echo "::error::Did not create a database for Javascript, or created it in the wrong location." \
-              "Expected location was '${RUNNER_TEMP}/customDbLocation/javascript' but actual was '${JAVASCRIPT_DB}'"
+            "Expected location was '${RUNNER_TEMP}/customDbLocation/javascript' but actual was '${JAVASCRIPT_DB}'"
-            exit 1
+          exit 1
-          fi
+        fi
-          PYTHON_DB="${{ fromJson(steps.analysis.outputs.db-locations).python }}"
+        PYTHON_DB="${{ fromJson(steps.analysis.outputs.db-locations).python }}"
-          if [[ ! -d "$PYTHON_DB" ]] || [[ ! "$PYTHON_DB" == "${RUNNER_TEMP}/customDbLocation/python" ]]; then
+        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." \
+          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}'"
+            "Expected location was '${RUNNER_TEMP}/customDbLocation/python' but actual was '${PYTHON_DB}'"
-            exit 1
+          exit 1
-          fi
+        fi
     env:
       CODEQL_ACTION_TEST_MODE: true

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

@@ -11,28 +11,26 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   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:
       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
     name: "Upload-sarif: 'ref' and 'sha' from inputs"
     permissions:
       contents: read
@@ -40,44 +38,56 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
+
-          python-version: '3.11'
+        matrix.version == 'stable-v2.13.5' ||
-      - name: Check out repository
+
-        uses: actions/checkout@v4
+        matrix.version == 'stable-v2.14.6')
-      - name: Prepare test
+      with:
-        id: prepare-test
+        python-version: '3.11'
-        uses: ./.github/actions/prepare-test
+    - name: Check out repository
-        with:
+      uses: actions/checkout@v4
-          version: ${{ matrix.version }}
+    - name: Prepare test
-          use-all-platform-bundle: 'false'
+      id: prepare-test
-      - uses: ./../action/init
+      uses: ./.github/actions/prepare-test
-        with:
+      with:
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+        version: ${{ matrix.version }}
-          languages: cpp,csharp,java,javascript,python
+        use-all-platform-bundle: 'false'
-          config-file: ${{ github.repository }}/tests/multi-language-repo/.github/codeql/custom-queries.yml@${{
+    - name: Set environment variable for Swift enablement
-            github.sha }}
+      if: >-
-      - name: Build code
+        runner.os != 'Windows' && (
-        shell: bash
+            matrix.version == '20220908' ||
-        run: ./build.sh
+            matrix.version == '20221211'
-      - uses: ./../action/analyze
+        )
-        with:
+      shell: bash
-          upload-database: false
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
-          ref: refs/heads/main
+    - uses: ./../action/init
-          sha: 5e235361806c361d4d3f8859e3c897658025a9a2
+      with:
-          upload: never
+        tools: ${{ steps.prepare-test.outputs.tools-url }}
-      - uses: ./../action/upload-sarif
+        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
+      shell: bash
+      run: ./build.sh
+    - uses: ./../action/analyze
+      with:
+        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

@@ -11,28 +11,68 @@ env:
 on:
   push:
     branches:
-      - main
+    - main
-      - releases/v*
+    - releases/v*
   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:
       matrix:
         include:
-          - os: ubuntu-latest
+        - os: ubuntu-latest
-            version: latest
+          version: stable-20220908
-          - os: macos-latest
+        - os: macos-latest
-            version: latest
+          version: stable-20220908
-          - os: windows-latest
+        - os: windows-latest
-            version: 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: Use a custom `checkout_path`
     permissions:
       contents: read
@@ -40,94 +80,107 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Python on MacOS
+    - name: Setup Python on MacOS
-        uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
-        if: >-
+      if: >-
-          matrix.os == 'macos-latest' && (
+        matrix.os == 'macos-latest' && (
 
-          matrix.version == 'stable-20230403' ||
+        matrix.version == 'stable-20220908' ||
 
-          matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-20221211' ||
 
-          matrix.version == 'stable-v2.14.6')
+        matrix.version == 'stable-20230418' ||
-        with:
+
-          python-version: '3.11'
+        matrix.version == 'stable-v2.13.5' ||
-      - name: Check out repository
+
-        uses: actions/checkout@v4
+        matrix.version == 'stable-v2.14.6')
-      - name: Prepare test
+      with:
-        id: prepare-test
+        python-version: '3.11'
-        uses: ./.github/actions/prepare-test
+    - name: Check out repository
-        with:
+      uses: actions/checkout@v4
-          version: ${{ matrix.version }}
+    - name: Prepare test
-          use-all-platform-bundle: 'false'
+      id: prepare-test
-      - name: Delete original checkout
+      uses: ./.github/actions/prepare-test
-        shell: bash
+      with:
-        run: |
+        version: ${{ matrix.version }}
-          # delete the original checkout so we don't accidentally use it.
+        use-all-platform-bundle: 'false'
-          # Actions does not support deleting the current working directory, so we
+    - name: Set environment variable for Swift enablement
-          # delete the contents of the directory instead.
+      if: >-
-          rm -rf ./* .github .git
+        runner.os != 'Windows' && (
+            matrix.version == '20220908' ||
+            matrix.version == '20221211'
+        )
+      shell: bash
+      run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
+    - name: Delete original checkout
+      shell: bash
+      run: |
+        # delete the original checkout so we don't accidentally use it.
+        # Actions does not support deleting the current working directory, so we
+        # delete the contents of the directory instead.
+        rm -rf ./* .github .git
   # Check out the actions repo again, but at a different location.
   # choose an arbitrary SHA so that we can later test that the commit_oid is not from main
-      - uses: actions/checkout@v4
+    - uses: actions/checkout@v4
-        with:
+      with:
-          ref: 474bbf07f9247ffe1856c6a0f94aeeb10e7afee6
+        ref: 474bbf07f9247ffe1856c6a0f94aeeb10e7afee6
-          path: x/y/z/some-path
+        path: x/y/z/some-path
 
-      - uses: ./../action/init
+    - uses: ./../action/init
-        with:
+      with:
-          tools: ${{ steps.prepare-test.outputs.tools-url }}
+        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-root: x/y/z/some-path/tests/multi-language-repo
+        debug: true
 
-      - name: Build code
+    - name: Build code
-        shell: bash
+      shell: bash
-        working-directory: x/y/z/some-path/tests/multi-language-repo
+      working-directory: x/y/z/some-path/tests/multi-language-repo
-        run: |
+      run: |
-          ./build.sh
+        ./build.sh
 
-      - uses: ./../action/analyze
+    - uses: ./../action/analyze
-        with:
+      with:
-          checkout_path: x/y/z/some-path/tests/multi-language-repo
+        checkout_path: x/y/z/some-path/tests/multi-language-repo
-          ref: v1.1.0
+        ref: v1.1.0
-          sha: 474bbf07f9247ffe1856c6a0f94aeeb10e7afee6
+        sha: 474bbf07f9247ffe1856c6a0f94aeeb10e7afee6
-          upload: never
+        upload: never
-          upload-database: false
+        upload-database: false
 
-      - uses: ./../action/upload-sarif
+    - uses: ./../action/upload-sarif
-        with:
+      with:
-          ref: v1.1.0
+        ref: v1.1.0
-          sha: 474bbf07f9247ffe1856c6a0f94aeeb10e7afee6
+        sha: 474bbf07f9247ffe1856c6a0f94aeeb10e7afee6
-          checkout_path: x/y/z/some-path/tests/multi-language-repo
+        checkout_path: x/y/z/some-path/tests/multi-language-repo
 
-      - name: Verify SARIF after upload
+    - name: Verify SARIF after upload
-        shell: bash
+      shell: bash
-        run: |
+      run: |
-          EXPECTED_COMMIT_OID="474bbf07f9247ffe1856c6a0f94aeeb10e7afee6"
+        EXPECTED_COMMIT_OID="474bbf07f9247ffe1856c6a0f94aeeb10e7afee6"
-          EXPECTED_REF="v1.1.0"
+        EXPECTED_REF="v1.1.0"
-          EXPECTED_CHECKOUT_URI_SUFFIX="/x/y/z/some-path/tests/multi-language-repo"
+        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)"
+        ACTUAL_COMMIT_OID="$(cat "$RUNNER_TEMP/payload.json" | jq -r .commit_oid)"
-          ACTUAL_REF="$(cat "$RUNNER_TEMP/payload.json" | jq -r .ref)"
+        ACTUAL_REF="$(cat "$RUNNER_TEMP/payload.json" | jq -r .ref)"
-          ACTUAL_CHECKOUT_URI="$(cat "$RUNNER_TEMP/payload.json" | jq -r .checkout_uri)"
+        ACTUAL_CHECKOUT_URI="$(cat "$RUNNER_TEMP/payload.json" | jq -r .checkout_uri)"
 
-          if [[ "$EXPECTED_COMMIT_OID" != "$ACTUAL_COMMIT_OID" ]]; then
+        if [[ "$EXPECTED_COMMIT_OID" != "$ACTUAL_COMMIT_OID" ]]; then
-            echo "::error Invalid commit oid. Expected: $EXPECTED_COMMIT_OID Actual: $ACTUAL_COMMIT_OID"
+          echo "::error Invalid commit oid. Expected: $EXPECTED_COMMIT_OID Actual: $ACTUAL_COMMIT_OID"
-            echo "$RUNNER_TEMP/payload.json"
+          echo "$RUNNER_TEMP/payload.json"
-            exit 1
+          exit 1
-          fi
+        fi
 
-          if [[ "$EXPECTED_REF" != "$ACTUAL_REF" ]]; then
+        if [[ "$EXPECTED_REF" != "$ACTUAL_REF" ]]; then
-            echo "::error Invalid ref. Expected: '$EXPECTED_REF' Actual: '$ACTUAL_REF'"
+          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 [[ "$ACTUAL_CHECKOUT_URI" != *$EXPECTED_CHECKOUT_URI_SUFFIX ]]; then
+        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 "::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
     env:
       CODEQL_ACTION_TEST_MODE: true

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

@@ -3,6 +3,7 @@
 name: Code-Scanning config CLI tests
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  CODEQL_PASS_CONFIG_TO_CLI: true
 
 on:
   push:
@@ -15,8 +16,6 @@ on:
     - synchronize
     - reopened
     - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 
 jobs:
@@ -205,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.yml

@@ -17,17 +17,18 @@ on:
     - synchronize
     - reopened
     - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   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: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     steps:
       - name: Dump GitHub event
         run: cat "${GITHUB_EVENT_PATH}"
@@ -41,6 +42,17 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           go-version: ^1.13.1
+      - name: Setup Python on MacOS
+        uses: actions/setup-python@v5
+        if: |
+          matrix.os == 'macos-latest' && (
+          matrix.version == 'stable-20220908' ||
+          matrix.version == 'stable-20221211' ||
+          matrix.version == 'stable-20230418' ||
+          matrix.version == 'stable-v2.13.5' ||
+          matrix.version == 'stable-v2.14.6')
+        with:
+          python-version: '3.11'
       - uses: ./../action/init
         with:
           tools: ${{ steps.prepare-test.outputs.tools-url }}
@@ -52,11 +64,9 @@ jobs:
         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
+          ram: 1
   download-and-check-artifacts:
     name: Download and check debug artifacts after failure in analyze
     needs: upload-artifacts
@@ -68,23 +78,27 @@ jobs:
       - name: Check expected artifacts exist
         shell: bash
         run: |
+          OPERATING_SYSTEMS="ubuntu-latest macos-latest"
           LANGUAGES="cpp csharp go java javascript python"
-          cd "./my-debug-artifacts"
+          for os in $OPERATING_SYSTEMS; do
-          echo "Artifacts from run:"
+            pushd "./my-debug-artifacts-$os"
-          for language in $LANGUAGES; do
+            echo "Artifacts from run on $os:"
-            echo "- Checking $language"
+            for language in $LANGUAGES; do
-            if [[ ! -f "my-db-$language-partial.zip" ]] ; then
+              echo "- Checking $language"
-              echo "Missing a partial database bundle for $language"
+              if [[ ! -f "my-db-$language-partial.zip" ]] ; then
-              exit 1
+                echo "Missing a partial database bundle for $language"
-            fi
+                exit 1
-            if [[ ! -d "log" ]] ; then
+              fi
-              echo "Missing database initialization logs"
+              if [[ ! -d "log" ]] ; then
-              exit 1
+                echo "Missing database initialization logs"
-            fi
+                exit 1
-            if [[ ! "$language" == "go" ]] && [[ ! -d "$language/log" ]] ; then
+              fi
-              echo "Missing logs for $language"
+              if [[ ! "$language" == "go" ]] && [[ ! -d "$language/log" ]] ; then
-              exit 1
+                echo "Missing logs for $language"
-            fi
+                exit 1
+              fi
+            done
+            popd
           done
         env:
           GO111MODULE: auto

.github/workflows/debug-artifacts.yml

@@ -16,19 +16,20 @@ on:
     - synchronize
     - reopened
     - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   upload-artifacts:
     strategy:
       matrix:
+        os:
+        - ubuntu-latest
+        - macos-latest
         version:
-        - stable-20230403
+        - stable-20220908
+        - stable-20221211
+        - stable-20230418
         - stable-v2.13.5
         - stable-v2.14.6
-        - stable-v2.15.5
-        - stable-v2.16.6
         - default
         - latest
         - nightly-latest
@@ -36,7 +37,7 @@ jobs:
     env:
       CODEQL_ACTION_TEST_MODE: true
     timeout-minutes: 45
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
@@ -48,6 +49,17 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           go-version: ^1.13.1
+      - name: Setup Python on MacOS
+        uses: actions/setup-python@v5
+        if: |
+          matrix.os == 'macos-latest' && (
+          matrix.version == 'stable-20220908' ||
+          matrix.version == 'stable-20221211' ||
+          matrix.version == 'stable-20230418' ||
+          matrix.version == 'stable-v2.13.5' ||
+          matrix.version == 'stable-v2.14.6')
+        with:
+          python-version: '3.11'
       - uses: ./../action/init
         id: init
         with:
@@ -74,27 +86,29 @@ jobs:
       - name: Check expected artifacts exist
         shell: bash
         run: |
-          VERSIONS="stable-20230403 stable-v2.13.5 stable-v2.14.6 stable-v2.15.5 stable-v2.16.6 default latest nightly-latest"
+          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
-            pushd "./my-debug-artifacts-${version//./}"
+            for os in ubuntu-latest macos-latest; do
-            echo "Artifacts from version $version:"
+              pushd "./my-debug-artifacts-$os-${version//./}"
-            for language in $LANGUAGES; do
+              echo "Artifacts from version $version on $os:"
-              echo "- Checking $language"
+              for language in $LANGUAGES; do
-              if [[ ! -f "$language.sarif" ]] ; then
+                echo "- Checking $language"
-                echo "Missing a SARIF file for $language"
+                if [[ ! -f "$language.sarif" ]] ; then
-                exit 1
+                  echo "Missing a SARIF file for $language"
-              fi
+                  exit 1
-              if [[ ! -f "my-db-$language.zip" ]] ; then
+                fi
-                echo "Missing a database bundle for $language"
+                if [[ ! -f "my-db-$language.zip" ]] ; then
-                exit 1
+                  echo "Missing a database bundle for $language"
-              fi
+                  exit 1
-              if [[ ! -d "$language/log" ]] ; then
+                fi
-                echo "Missing logs for $language"
+                if [[ ! -d "$language/log" ]] ; then
-                exit 1
+                  echo "Missing logs for $language"
-              fi
+                  exit 1
+                fi
+              done
+              popd
             done
-            popd
           done
         env:
           GO111MODULE: auto

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

@@ -11,8 +11,6 @@ on:
     - synchronize
     - reopened
     - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 
 jobs:

.github/workflows/pr-checks.yml

@@ -95,6 +95,18 @@ jobs:
     timeout-minutes: 45
 
     steps:
+      - name: Setup Python on MacOS
+        uses: actions/setup-python@v5
+        if: |
+          matrix.os == 'macos-latest' && (
+          matrix.version == 'stable-20220908' ||
+          matrix.version == 'stable-20221211' ||
+          matrix.version == 'stable-20230418' ||
+          matrix.version == 'stable-v2.13.5' ||
+          matrix.version == 'stable-v2.14.6')
+        with:
+          python-version: '3.11'
+
       - uses: actions/checkout@v4
       - name: npm test
         run: |

.github/workflows/python-deps.yml

@@ -0,0 +1,186 @@
+name: Test Python Package Installation
+
+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]
+    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:
+    - name: Setup Python on MacOS
+      uses: actions/setup-python@v5
+      if: |
+        matrix.os == 'macos-latest' && (
+        matrix.version == 'stable-20220908' ||
+        matrix.version == 'stable-20221211' ||
+        matrix.version == 'stable-20230418' ||
+        matrix.version == 'stable-v2.13.5' ||
+        matrix.version == 'stable-v2.14.6')
+      with:
+        python-version: '3.11'
+
+    # 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@v5
+      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/query-filters.yml

@@ -11,8 +11,6 @@ on:
     - synchronize
     - reopened
     - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 
 jobs:

.github/workflows/rebuild.yml

@@ -3,7 +3,6 @@ name: Rebuild Action
 on:
   pull_request:
     types: [labeled]
-  workflow_dispatch:
 
 jobs:
   rebuild:
@@ -25,23 +24,6 @@ jobs:
           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

.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."
@@ -32,26 +27,18 @@ CHECKS="$(gh api repos/github/codeql-action/commits/"${GITHUB_SHA}"/check-runs -
 
 echo "$CHECKS" | jq
 
-echo "{\"contexts\": ${CHECKS}}" > checks.json
+for BRANCH in main releases/v2 releases/v3; do
-
-echo "Updating main"
-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"
+  echo "{\"contexts\": ${CHECKS}}" > checks.json
+
+  # we need to special case the JS checks for releases/v2
+  if [ "$BRANCH" == "releases/v2" ]; then
+    # we remove entries matching "Check JS (*" and add "Check JS" to the list
+    PROCESSED_CHECKS="$(echo "$CHECKS" | jq --compact-output --raw-output 'map(select(. | contains("Check JS (") | not)) + ["Check JS"] | unique | sort' )"
+    echo "{\"contexts\": ${PROCESSED_CHECKS}}" > checks.json
+  fi
   gh api --silent -X "PATCH" "repos/github/codeql-action/branches/$BRANCH/protection/required_status_checks" --input checks.json
+  # cat checks.json | jq > checks-"${BRANCH//\//-}".json
 done
 
 rm checks.json

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

@@ -16,8 +16,6 @@ on:
     - synchronize
     - reopened
     - ready_for_review
-  schedule:
-    - cron: '0 5 * * *'
   workflow_dispatch: {}
 jobs:
   test-codeql-bundle-all:

.gitignore

@@ -1,7 +1,2 @@
 # Ignore for example failing-tests.json from AVA
-node_modules/.cache/
+node_modules/.cache
-# Java build files
-.gradle/
-*.class
-# macOS
-.DS_Store

CHANGELOG.md

@@ -6,90 +6,8 @@ Note that the only difference between `v2` and `v3` of the CodeQL Action is the
 
 ## [UNRELEASED]
 
-- 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)

CODEOWNERS

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

CONTRIBUTING.md

@@ -57,24 +57,28 @@ 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` and a backport pull request to `releases/v2` will both 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. The backport pull request will incorporate the updates into `releases/v2`.
+1. Review the checklist items in the pull request description.
-1. Approve the mergeback and backport pull requests and automerge them.
+    Once you've checked off all but the last two of these, approve the PR and automerge it.
+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)
 
-Since the `codeql-action` runs most of its testing through individual Actions workflows, there are over two hundred jobs that need to pass in order for a PR to turn green. You can regenerate the checks automatically by running the [update-required-checks.sh](.github/workflows/script/update-required-checks.sh) script:
+Since the `codeql-action` runs most of its testing through individual Actions workflows, there are over two hundred jobs that need to pass in order for a PR to turn green. You can regenerate the required checks automatically by running the [update-required-checks.sh](.github/workflows/script/update-required-checks.sh) script:
 
 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`, `v2`, and `v3` 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`, `v2`, and `v2` have been updated.
 
-Note that any updates to checks need to be backported to the `releases/v2` branch, in order to maintain the same set of names for required checks.
+Note that the `update-required-checks.sh` script should be updated when there are new diversions between the checks on different release branches.
 
 ## Deprecating a CodeQL version (write access required)
 
@@ -110,7 +114,7 @@ To deprecate an older version of the Action:
    - 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.
+1. Make a PR to bump the `OLDEST_SUPPORTED_MAJOR_VERSION` in [release-branches.py](.github/actions/release-branches/release-branches.py).  Once this PR is merged, the release process will no longer backport changes to the deprecated release version.
 
 ## Resources
 

README.md

@@ -4,11 +4,20 @@ This action runs GitHub's industry-leading semantic code analysis engine, [CodeQ
 
 For a list of recent changes, see the CodeQL Action's [changelog](CHANGELOG.md).
 
+## :loudspeaker: Node 16 deprecation, upcoming CodeQL Action v3 :loudspeaker:
+Announcement for users of this Action and code scanning workflows on GitHub.com:
+
+- You will begin to see these warnings about Node.js 16 deprecation in your 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). 
+
 ## License
 
 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,23 +25,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)."
 
-### 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)."
-
-## Supported versions of the CodeQL Action
-
-The following versions of the CodeQL Action are currently supported:
-
-- v3 (latest)
-- v2 (deprecated, support will end on December 5th, 2024)
-
-The only difference between CodeQL Action v2 and v3 is the version of Node.js on which they run. CodeQL Action v3 runs on Node 20, while CodeQL Action v2 runs on Node 16.
-
-To provide the best experience to customers using older versions of GitHub Enterprise Server, we will continue to release CodeQL Action v2 so that these customers can continue to run the latest version of CodeQL as long as their version of GitHub Enterprise Server is supported. For example CodeQL Action v3.22.11 was the first release of CodeQL Action v3 and is functionally identical to v2.22.11. This approach provides an easy way to track exactly which features are included in different versions by looking at the minor and patch version numbers.
-
-For more information, see "[Code scanning: deprecation of CodeQL Action v2](https://github.blog/changelog/2024-01-12-code-scanning-deprecation-of-codeql-action-v2/)."
-
 ## Troubleshooting
 
 Read about [troubleshooting code scanning](https://docs.github.com/en/code-security/code-scanning/troubleshooting-code-scanning).

analyze/action.yml

@@ -52,10 +52,10 @@ inputs:
     # If changing this, make sure to update workflow.ts accordingly.
     default: ${{ github.workspace }}
   ref:
-    description: "The ref where results will be uploaded. If not provided, the Action will use the GITHUB_REF environment variable. If provided, the sha input must be provided as well. This input is ignored for pull requests from forks."
+    description: "The ref where results will be uploaded. If not provided, the Action will use the GITHUB_REF environment variable. If provided, the sha input must be provided as well. This input is not available in pull requests from forks."
     required: false
   sha:
-    description: "The sha of the HEAD of the ref where results will be uploaded. If not provided, the Action will use the GITHUB_SHA environment variable. If provided, the ref input must be provided as well. This input is ignored for pull requests from forks."
+    description: "The sha of the HEAD of the ref where results will be uploaded. If not provided, the Action will use the GITHUB_SHA environment variable. If provided, the ref input must be provided as well. This input is not available in pull requests from forks."
     required: false
   category:
     description: String used by Code Scanning for matching the analyses
@@ -69,8 +69,6 @@ inputs:
     required: true
     default: "true"
   token:
-    description: "GitHub token to use for authenticating with this instance of GitHub. The token needs the `security-events: write` permission."
-    required: false
     default: ${{ github.token }}
   matrix:
     default: ${{ toJson(matrix) }}

autobuild/action.yml

@@ -3,8 +3,6 @@ description: 'Attempt to automatically build code'
 author: 'GitHub'
 inputs:
   token:
-    description: "GitHub token to use for authenticating with this instance of GitHub. The token needs the `security-events: write` permission."
-    required: false
     default: ${{ github.token }}
   matrix:
     default: ${{ toJson(matrix) }}

init/action.yml

@@ -7,33 +7,8 @@ inputs:
     required: false
     # If not specified the Action will check in several places until it finds the CodeQL tools.
   languages:
-    description: >-
+    description: |
-      A comma-separated list of CodeQL languages to analyze.
+      A comma-separated value of the languages to be analysed e.g. python,javascript
-
-      Due to the performance benefit of parallelizing builds, we recommend specifying languages to
-      analyze using a matrix and providing `\$\{{ matrix.language }}` as this input.
-
-      For more information, see
-      https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning#changing-the-languages-that-are-analyzed.
-    required: false
-  build-mode:
-    description: >-
-      The build mode that will be used to analyze the language. This input is only available when
-      analyzing a single CodeQL language per job, for example using a matrix.
-
-      Available build modes will differ based on the language being analyzed. One of:
-
-      - `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.
-                     To use this build mode, ensure that your workflow calls the `autobuild` action
-                     between the `init` and `analyze` steps.
-                     Available for all compiled languages.
-      - `manual`:   The database will be created by building the source code using a manually
-                     specified build command. To use this build mode, specify manual build steps in
-                     your workflow between the `init` and `analyze` steps. Available for all
-                     compiled languages.
     required: false
   token:
     description: GitHub token to use for authenticating with this instance of GitHub. To download custom packs from multiple registries, use the registries input.
@@ -78,7 +53,7 @@ inputs:
     required: false
   packs:
     description: >-
-      Comma-separated list of packs to run. Reference a pack in the format `scope/name[@version]`. If `version` is not
+      [Experimental] Comma-separated list of packs to run. Reference a pack in the format `scope/name[@version]`. If `version` is not
       specified, then the latest version of the pack is used. By default, this overrides the same setting in a
       configuration file; prefix with "+" to use both sets of packs.
 
@@ -89,8 +64,9 @@ inputs:
     description: A token for fetching external config files and queries if they reside in a private repository in the same GitHub instance that is running this action.
     required: false
   setup-python-dependencies:
-    description: DEPRECATED. This option is ignored since CodeQL Action no longer installs Python dependencies as of versions 3.25.0 and 2.25.0.
+    description: Try to auto-install your python dependencies
-    required: false
+    required: true
+    default: 'true'
   source-root:
     description: Path of the root source code directory, relative to $GITHUB_WORKSPACE.
     required: false

lib/actions-util.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFileType = exports.FileCmdNotFoundError = exports.getWorkflowRunAttempt = exports.getWorkflowRunID = exports.getUploadValue = exports.printDebugLogs = exports.isAnalyzingDefaultBranch = exports.getRelativeScriptPath = exports.isRunningLocalAction = exports.getWorkflowEventName = exports.getActionVersion = exports.getRef = exports.determineMergeBaseCommitOid = exports.getCommitOid = exports.getTemporaryDirectory = exports.getOptionalInput = exports.getRequiredInput = void 0;
+exports.getFileType = exports.getWorkflowRunAttempt = exports.getWorkflowRunID = exports.getUploadValue = exports.printDebugLogs = exports.isAnalyzingDefaultBranch = exports.getRelativeScriptPath = exports.isRunningLocalAction = exports.getWorkflowEventName = exports.getActionVersion = exports.getRef = exports.determineMergeBaseCommitOid = exports.getCommitOid = exports.getTemporaryDirectory = exports.getOptionalInput = exports.getRequiredInput = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const core = __importStar(require("@actions/core"));
@@ -41,7 +41,7 @@ const pkg = require("../package.json");
 const getRequiredInput = function (name) {
     const value = core.getInput(name);
     if (!value) {
-        throw new util_1.ConfigurationError(`Input required and not supplied: ${name}`);
+        throw new util_1.UserError(`Input required and not supplied: ${name}`);
     }
     return value;
 };
@@ -177,7 +177,7 @@ async function getRef() {
     const hasShaInput = !!shaInput;
     // If one of 'ref' or 'sha' are provided, both are required
     if ((hasRefInput || hasShaInput) && !(hasRefInput && hasShaInput)) {
-        throw new util_1.ConfigurationError("Both 'ref' and 'sha' are required if one of them is provided.");
+        throw new util_1.UserError("Both 'ref' and 'sha' are required if one of them is provided.");
     }
     const ref = refInput || getRefFromEnv();
     const sha = shaInput || (0, util_1.getRequiredEnvParam)("GITHUB_SHA");
@@ -380,13 +380,6 @@ function getWorkflowRunAttempt() {
     return workflowRunAttempt;
 }
 exports.getWorkflowRunAttempt = getWorkflowRunAttempt;
-class FileCmdNotFoundError extends Error {
-    constructor(msg) {
-        super(msg);
-        this.name = "FileCmdNotFoundError";
-    }
-}
-exports.FileCmdNotFoundError = FileCmdNotFoundError;
 /**
  * Tries to obtain the output of the `file` command for the file at the specified path.
  * The output will vary depending on the type of `file`, which operating system we are running on, etc.
@@ -394,18 +387,11 @@ exports.FileCmdNotFoundError = FileCmdNotFoundError;
 const getFileType = async (filePath) => {
     let stderr = "";
     let stdout = "";
-    let fileCmdPath;
-    try {
-        fileCmdPath = await safeWhich.safeWhich("file");
-    }
-    catch (e) {
-        throw new FileCmdNotFoundError(`The \`file\` program is required, but does not appear to be installed. Please install it: ${e}`);
-    }
     try {
         // The `file` command will output information about the type of file pointed at by `filePath`.
         // For binary files, this may include e.g. whether they are static of dynamic binaries.
         // The `-L` switch instructs the command to follow symbolic links.
-        await new toolrunner.ToolRunner(fileCmdPath, ["-L", filePath], {
+        await new toolrunner.ToolRunner(await safeWhich.safeWhich("file"), ["-L", filePath], {
             silent: true,
             listeners: {
                 stdout: (data) => {

lib/actions-util.test.js

@@ -227,9 +227,7 @@ const util_1 = require("./util");
     const infoStub = sinon.stub(core, "info");
     process.env["GITHUB_EVENT_NAME"] = "pull_request";
     process.env["GITHUB_SHA"] = "100912429fab4cb230e66ffb11e738ac5194e73a";
-    await (0, util_1.withTmpDir)(async (tmpDir) => {
+    await actionsUtil.determineMergeBaseCommitOid(path.join(__dirname, "../.."));
-        await actionsUtil.determineMergeBaseCommitOid(tmpDir);
-    });
     t.deepEqual(1, infoStub.callCount);
     t.assert(infoStub.firstCall.args[0].startsWith("The checkout path provided to the action does not appear to be a git repository."));
     infoStub.restore();

lib/analysis-paths.js

@@ -0,0 +1,84 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.includeAndExcludeAnalysisPaths = exports.printPathFiltersWarning = exports.legalWindowsPathCharactersRegex = void 0;
+const path = __importStar(require("path"));
+function isInterpretedLanguage(language) {
+    return (language === "javascript" || language === "python" || language === "ruby");
+}
+// Matches a string containing only characters that are legal to include in paths on windows.
+exports.legalWindowsPathCharactersRegex = /^[^<>:"|?]*$/;
+// Builds an environment variable suitable for LGTM_INDEX_INCLUDE or LGTM_INDEX_EXCLUDE
+function buildIncludeExcludeEnvVar(paths) {
+    // Ignore anything containing a *
+    paths = paths.filter((p) => p.indexOf("*") === -1);
+    // Some characters are illegal in path names in windows
+    if (process.platform === "win32") {
+        paths = paths.filter((p) => p.match(exports.legalWindowsPathCharactersRegex));
+    }
+    return paths.join("\n");
+}
+function printPathFiltersWarning(config, logger) {
+    // Index include/exclude/filters only work in javascript/python/ruby.
+    // If any other languages are detected/configured then show a warning.
+    if ((config.paths.length !== 0 || config.pathsIgnore.length !== 0) &&
+        !config.languages.every(isInterpretedLanguage)) {
+        logger.warning('The "paths"/"paths-ignore" fields of the config only have effect for JavaScript, Python, and Ruby');
+    }
+}
+exports.printPathFiltersWarning = printPathFiltersWarning;
+function includeAndExcludeAnalysisPaths(config) {
+    // The 'LGTM_INDEX_INCLUDE' and 'LGTM_INDEX_EXCLUDE' environment variables
+    // control which files/directories are traversed when scanning.
+    // This allows including files that otherwise would not be scanned, or
+    // excluding and not traversing entire file subtrees.
+    // It does not understand globs or double-globs because that would require it to
+    // traverse the entire file tree to determine which files are matched.
+    // Any paths containing "*" are not included in these.
+    if (config.paths.length !== 0) {
+        process.env["LGTM_INDEX_INCLUDE"] = buildIncludeExcludeEnvVar(config.paths);
+    }
+    // If the temporary or tools directory is in the working directory ignore that too.
+    const tempRelativeToWorking = path.relative(process.cwd(), config.tempDir);
+    let pathsIgnore = config.pathsIgnore;
+    if (!tempRelativeToWorking.startsWith("..") &&
+        !path.isAbsolute(tempRelativeToWorking)) {
+        pathsIgnore = pathsIgnore.concat(tempRelativeToWorking);
+    }
+    if (pathsIgnore.length !== 0) {
+        process.env["LGTM_INDEX_EXCLUDE"] = buildIncludeExcludeEnvVar(pathsIgnore);
+    }
+    // The 'LGTM_INDEX_FILTERS' environment variable controls which files are
+    // extracted or ignored. It does not control which directories are traversed.
+    // This does understand the glob and double-glob syntax.
+    const filters = [];
+    filters.push(...config.paths.map((p) => `include:${p}`));
+    filters.push(...config.pathsIgnore.map((p) => `exclude:${p}`));
+    if (filters.length !== 0) {
+        process.env["LGTM_INDEX_FILTERS"] = filters.join("\n");
+    }
+}
+exports.includeAndExcludeAnalysisPaths = includeAndExcludeAnalysisPaths;
+//# sourceMappingURL=analysis-paths.js.map

lib/analysis-paths.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"analysis-paths.js","sourceRoot":"","sources":["../src/analysis-paths.ts"],"names":[],"mappings":"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"}

lib/analysis-paths.test.js

@@ -0,0 +1,124 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = __importStar(require("path"));
+const ava_1 = __importDefault(require("ava"));
+const analysisPaths = __importStar(require("./analysis-paths"));
+const testing_utils_1 = require("./testing-utils");
+const util = __importStar(require("./util"));
+(0, testing_utils_1.setupTests)(ava_1.default);
+(0, ava_1.default)("emptyPaths", async (t) => {
+    return await util.withTmpDir(async (tmpDir) => {
+        const config = {
+            languages: [],
+            queries: {},
+            pathsIgnore: [],
+            paths: [],
+            originalUserInput: {},
+            tempDir: tmpDir,
+            codeQLCmd: "",
+            gitHubVersion: { type: util.GitHubVariant.DOTCOM },
+            dbLocation: path.resolve(tmpDir, "codeql_databases"),
+            packs: {},
+            debugMode: false,
+            debugArtifactName: util.DEFAULT_DEBUG_ARTIFACT_NAME,
+            debugDatabaseName: util.DEFAULT_DEBUG_DATABASE_NAME,
+            augmentationProperties: {
+                injectedMlQueries: false,
+                packsInputCombines: false,
+                queriesInputCombines: false,
+            },
+            trapCaches: {},
+            trapCacheDownloadTime: 0,
+        };
+        analysisPaths.includeAndExcludeAnalysisPaths(config);
+        t.is(process.env["LGTM_INDEX_INCLUDE"], undefined);
+        t.is(process.env["LGTM_INDEX_EXCLUDE"], undefined);
+        t.is(process.env["LGTM_INDEX_FILTERS"], undefined);
+    });
+});
+(0, ava_1.default)("nonEmptyPaths", async (t) => {
+    return await util.withTmpDir(async (tmpDir) => {
+        const config = {
+            languages: [],
+            queries: {},
+            paths: ["path1", "path2", "**/path3"],
+            pathsIgnore: ["path4", "path5", "path6/**"],
+            originalUserInput: {},
+            tempDir: tmpDir,
+            codeQLCmd: "",
+            gitHubVersion: { type: util.GitHubVariant.DOTCOM },
+            dbLocation: path.resolve(tmpDir, "codeql_databases"),
+            packs: {},
+            debugMode: false,
+            debugArtifactName: util.DEFAULT_DEBUG_ARTIFACT_NAME,
+            debugDatabaseName: util.DEFAULT_DEBUG_DATABASE_NAME,
+            augmentationProperties: {
+                injectedMlQueries: false,
+                packsInputCombines: false,
+                queriesInputCombines: false,
+            },
+            trapCaches: {},
+            trapCacheDownloadTime: 0,
+        };
+        analysisPaths.includeAndExcludeAnalysisPaths(config);
+        t.is(process.env["LGTM_INDEX_INCLUDE"], "path1\npath2");
+        t.is(process.env["LGTM_INDEX_EXCLUDE"], "path4\npath5");
+        t.is(process.env["LGTM_INDEX_FILTERS"], "include:path1\ninclude:path2\ninclude:**/path3\nexclude:path4\nexclude:path5\nexclude:path6/**");
+    });
+});
+(0, ava_1.default)("exclude temp dir", async (t) => {
+    const tempDir = path.join(process.cwd(), "codeql-runner-temp");
+    const config = {
+        languages: [],
+        queries: {},
+        pathsIgnore: [],
+        paths: [],
+        originalUserInput: {},
+        tempDir,
+        codeQLCmd: "",
+        gitHubVersion: { type: util.GitHubVariant.DOTCOM },
+        dbLocation: path.resolve(tempDir, "codeql_databases"),
+        packs: {},
+        debugMode: false,
+        debugArtifactName: util.DEFAULT_DEBUG_ARTIFACT_NAME,
+        debugDatabaseName: util.DEFAULT_DEBUG_DATABASE_NAME,
+        augmentationProperties: {
+            injectedMlQueries: false,
+            packsInputCombines: false,
+            queriesInputCombines: false,
+        },
+        trapCaches: {},
+        trapCacheDownloadTime: 0,
+    };
+    analysisPaths.includeAndExcludeAnalysisPaths(config);
+    t.is(process.env["LGTM_INDEX_INCLUDE"], undefined);
+    t.is(process.env["LGTM_INDEX_EXCLUDE"], "codeql-runner-temp");
+    t.is(process.env["LGTM_INDEX_FILTERS"], undefined);
+});
+//# sourceMappingURL=analysis-paths.test.js.map

lib/analysis-paths.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"analysis-paths.test.js","sourceRoot":"","sources":["../src/analysis-paths.test.ts"],"names":[],"mappings":"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"}

lib/analyze-action-env.test.js

@@ -50,7 +50,7 @@ const util = __importStar(require("./util"));
         sinon
             .stub(statusReport, "createStatusReportBase")
             .resolves({});
-        sinon.stub(statusReport, "sendStatusReport").resolves();
+        sinon.stub(statusReport, "sendStatusReport").resolves(true);
         sinon.stub(actionsUtil, "isAnalyzingDefaultBranch").resolves(true);
         const gitHubVersion = {
             type: util.GitHubVariant.DOTCOM,

lib/analyze-action-env.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"analyze-action-env.test.js","sourceRoot":"","sources":["../src/analyze-action-env.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuB;AACvB,6CAA+B;AAE/B,4DAA8C;AAC9C,mDAAqC;AACrC,kDAAoC;AACpC,4DAA8C;AAC9C,8DAAgD;AAChD,mDAIyB;AACzB,6CAA+B;AAE/B,IAAA,0BAAU,EAAC,aAAI,CAAC,CAAC;AAEjB,4EAA4E;AAC5E,4EAA4E;AAC5E,+EAA+E;AAC/E,+EAA+E;AAC/E,gFAAgF;AAChF,iCAAiC;AAEjC,IAAA,aAAI,EAAC,8DAA8D,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IAC/E,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QACrC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,GAAG,IAAI,CAAC,iBAAiB,CAAC;QAC1D,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,GAAG,sCAAsC,CAAC;QAC1E,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,GAAG,wBAAwB,CAAC;QACzD,KAAK;aACF,IAAI,CAAC,YAAY,EAAE,wBAAwB,CAAC;aAC5C,QAAQ,CAAC,EAAmC,CAAC,CAAC;QACjD,KAAK,CAAC,IAAI,CAAC,YAAY,EAAE,kBAAkB,CAAC,CAAC,QAAQ,EAAE,CAAC;QACxD,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,0BAA0B,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEnE,MAAM,aAAa,GAAuB;YACxC,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,MAAM;SAChC,CAAC;QACF,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC;YAC5C,aAAa;YACb,SAAS,EAAE,EAAE;YACb,KAAK,EAAE,EAAE;YACT,UAAU,EAAE,EAAE;SACkB,CAAC,CAAC;QACpC,MAAM,iBAAiB,GAAG,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC;QACtE,iBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAC1D,iBAAiB,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC/D,MAAM,iBAAiB,GAAG,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC;QACtE,iBAAiB,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC5D,iBAAiB,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC5D,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QAC5D,IAAA,gCAAgB,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACjC,IAAA,0CAA0B,EAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAEpC,uEAAuE;QACvE,0EAA0E;QAC1E,iBAAiB;QACjB,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,GAAG,IAAI,CAAC;QACrC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,MAAM,CAAC;QAEnC,MAAM,eAAe,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAC3D,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QACzD,MAAM,aAAa,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;QAElD,uEAAuE;QACvE,oEAAoE;QACpE,4EAA4E;QAC5E,wEAAwE;QACxE,MAAM,aAAa,CAAC,UAAU,CAAC;QAE/B,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;QAC/D,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC;QAC7D,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;QAC9D,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC;IAC9D,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"analyze-action-env.test.js","sourceRoot":"","sources":["../src/analyze-action-env.test.ts"],"names":[],"mappings":"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"}

lib/analyze-action-input.test.js

@@ -50,7 +50,7 @@ const util = __importStar(require("./util"));
         sinon
             .stub(statusReport, "createStatusReportBase")
             .resolves({});
-        sinon.stub(statusReport, "sendStatusReport").resolves();
+        sinon.stub(statusReport, "sendStatusReport").resolves(true);
         const gitHubVersion = {
             type: util.GitHubVariant.DOTCOM,
         };

lib/analyze-action-input.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"analyze-action-input.test.js","sourceRoot":"","sources":["../src/analyze-action-input.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"analyze-action-input.test.js","sourceRoot":"","sources":["../src/analyze-action-input.test.ts"],"names":[],"mappings":"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"}

lib/analyze-action-post.js

@@ -31,14 +31,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const core = __importStar(require("@actions/core"));
 const analyzeActionPostHelper = __importStar(require("./analyze-action-post-helper"));
 const debugArtifacts = __importStar(require("./debug-artifacts"));
-const uploadSarifActionPostHelper = __importStar(require("./upload-sarif-action-post-helper"));
 const util_1 = require("./util");
 async function runWrapper() {
     try {
         await analyzeActionPostHelper.run(debugArtifacts.uploadSarifDebugArtifact);
-        // Also run the upload-sarif post action since we're potentially running
-        // the same steps in the analyze action.
-        await uploadSarifActionPostHelper.uploadArtifacts(debugArtifacts.uploadDebugArtifacts);
     }
     catch (error) {
         core.setFailed(`analyze post-action step failed: ${(0, util_1.wrapError)(error).message}`);

lib/analyze-action-post.js.map

@@ -1 +1 @@
-{"version":3,"file":"analyze-action-post.js","sourceRoot":"","sources":["../src/analyze-action-post.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;GAIG;AACH,oDAAsC;AAEtC,sFAAwE;AACxE,kEAAoD;AACpD,+FAAiF;AACjF,iCAAmC;AAEnC,KAAK,UAAU,UAAU;IACvB,IAAI,CAAC;QACH,MAAM,uBAAuB,CAAC,GAAG,CAAC,cAAc,CAAC,wBAAwB,CAAC,CAAC;QAE3E,wEAAwE;QACxE,wCAAwC;QACxC,MAAM,2BAA2B,CAAC,eAAe,CAC/C,cAAc,CAAC,oBAAoB,CACpC,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,SAAS,CACZ,oCAAoC,IAAA,gBAAS,EAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAC/D,CAAC;IACJ,CAAC;AACH,CAAC;AAED,KAAK,UAAU,EAAE,CAAC"}
+{"version":3,"file":"analyze-action-post.js","sourceRoot":"","sources":["../src/analyze-action-post.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;GAIG;AACH,oDAAsC;AAEtC,sFAAwE;AACxE,kEAAoD;AACpD,iCAAmC;AAEnC,KAAK,UAAU,UAAU;IACvB,IAAI,CAAC;QACH,MAAM,uBAAuB,CAAC,GAAG,CAAC,cAAc,CAAC,wBAAwB,CAAC,CAAC;IAC7E,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,SAAS,CACZ,oCAAoC,IAAA,gBAAS,EAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAC/D,CAAC;IACJ,CAAC;AACH,CAAC;AAED,KAAK,UAAU,EAAE,CAAC"}

lib/analyze-action.js

@@ -31,6 +31,7 @@ const fs = __importStar(require("fs"));
 const path_1 = __importDefault(require("path"));
 const perf_hooks_1 = require("perf_hooks");
 const core = __importStar(require("@actions/core"));
+const safe_which_1 = require("@chrisgavin/safe-which");
 const actionsUtil = __importStar(require("./actions-util"));
 const analyze_1 = require("./analyze");
 const api_client_1 = require("./api-client");
@@ -38,6 +39,7 @@ const autobuild_1 = require("./autobuild");
 const codeql_1 = require("./codeql");
 const config_utils_1 = require("./config-utils");
 const database_upload_1 = require("./database-upload");
+const diagnostics_1 = require("./diagnostics");
 const environment_1 = require("./environment");
 const feature_flags_1 = require("./feature-flags");
 const languages_1 = require("./languages");
@@ -48,26 +50,25 @@ const status_report_1 = require("./status-report");
 const trap_caching_1 = require("./trap-caching");
 const uploadLib = __importStar(require("./upload-lib"));
 const util = __importStar(require("./util"));
+const util_1 = require("./util");
 async function sendStatusReport(startedAt, config, stats, error, trapCacheUploadTime, dbCreationTimings, didUploadTrapCaches, logger) {
     const status = (0, status_report_1.getActionsStatus)(error, stats?.analyze_failure_language);
-    const statusReportBase = await (0, status_report_1.createStatusReportBase)(status_report_1.ActionName.Analyze, status, startedAt, config, await util.checkDiskUsage(), logger, error?.message, error?.stack);
+    const statusReportBase = await (0, status_report_1.createStatusReportBase)("finish", status, startedAt, await util.checkDiskUsage(), error?.message, error?.stack);
-    if (statusReportBase !== undefined) {
+    const report = {
-        const report = {
+        ...statusReportBase,
-            ...statusReportBase,
+        ...(stats || {}),
-            ...(stats || {}),
+        ...(dbCreationTimings || {}),
-            ...(dbCreationTimings || {}),
+    };
+    if (config && didUploadTrapCaches) {
+        const trapCacheUploadStatusReport = {
+            ...report,
+            trap_cache_upload_duration_ms: Math.round(trapCacheUploadTime || 0),
+            trap_cache_upload_size_bytes: Math.round(await (0, trap_caching_1.getTotalCacheSize)(config.trapCaches, logger)),
         };
-        if (config && didUploadTrapCaches) {
+        await statusReport.sendStatusReport(trapCacheUploadStatusReport);
-            const trapCacheUploadStatusReport = {
+    }
-                ...report,
+    else {
-                trap_cache_upload_duration_ms: Math.round(trapCacheUploadTime || 0),
+        await statusReport.sendStatusReport(report);
-                trap_cache_upload_size_bytes: Math.round(await (0, trap_caching_1.getTotalCacheSize)(config.trapCaches, logger)),
-            };
-            await statusReport.sendStatusReport(trapCacheUploadStatusReport);
-        }
-        else {
-            await statusReport.sendStatusReport(report);
-        }
     }
 }
 // `expect-error` should only be set to a non-false value by the CodeQL Action PR checks.
@@ -107,14 +108,10 @@ function doesGoExtractionOutputExist(config) {
  * - We approximate whether manual build steps are present by looking at
  * whether any extraction output already exists for Go.
  */
-async function runAutobuildIfLegacyGoWorkflow(config, features, logger) {
+async function runAutobuildIfLegacyGoWorkflow(config, logger) {
     if (!config.languages.includes(languages_1.Language.go)) {
         return;
     }
-    if (config.buildMode) {
-        logger.debug("Skipping legacy Go autobuild since a build mode has been specified.");
-        return;
-    }
     if (process.env[environment_1.EnvVar.DID_AUTOBUILD_GOLANG] === "true") {
         logger.debug("Won't run Go autobuild since it has already been run.");
         return;
@@ -134,7 +131,7 @@ async function runAutobuildIfLegacyGoWorkflow(config, features, logger) {
         return;
     }
     logger.debug("Running Go autobuild because extraction output (TRAP files) for Go code has not been found.");
-    await (0, autobuild_1.runAutobuild)(config, languages_1.Language.go, features, logger);
+    await (0, autobuild_1.runAutobuild)(languages_1.Language.go, config, logger);
 }
 async function run() {
     const startedAt = new Date();
@@ -147,29 +144,48 @@ async function run() {
     util.initializeEnvironment(actionsUtil.getActionVersion());
     const logger = (0, logging_1.getActionsLogger)();
     try {
-        const statusReportBase = await (0, status_report_1.createStatusReportBase)(status_report_1.ActionName.Analyze, "starting", startedAt, config, await util.checkDiskUsage(logger), logger);
+        if (!(await statusReport.sendStatusReport(await (0, status_report_1.createStatusReportBase)("finish", "starting", startedAt, await util.checkDiskUsage(logger))))) {
-        if (statusReportBase !== undefined) {
+            return;
-            await statusReport.sendStatusReport(statusReportBase);
         }
         config = await (0, config_utils_1.getConfig)(actionsUtil.getTemporaryDirectory(), logger);
         if (config === undefined) {
             throw new Error("Config file could not be found at expected location. Has the 'init' action been called?");
         }
-        const codeql = await (0, codeql_1.getCodeQL)(config.codeQLCmd);
         if (hasBadExpectErrorInput()) {
-            throw new util.ConfigurationError("`expect-error` input parameter is for internal use only. It should only be set by codeql-action or a fork.");
+            throw new util.UserError("`expect-error` input parameter is for internal use only. It should only be set by codeql-action or a fork.");
         }
         const apiDetails = (0, api_client_1.getApiDetails)();
         const outputDir = actionsUtil.getRequiredInput("output");
         const threads = util.getThreadsFlag(actionsUtil.getOptionalInput("threads") || process.env["CODEQL_THREADS"], logger);
         const repositoryNwo = (0, repository_1.parseRepositoryNwo)(util.getRequiredEnvParam("GITHUB_REPOSITORY"));
         const gitHubVersion = await (0, api_client_1.getGitHubVersion)();
-        util.checkActionVersion(actionsUtil.getActionVersion(), gitHubVersion);
         const features = new feature_flags_1.Features(gitHubVersion, repositoryNwo, actionsUtil.getTemporaryDirectory(), logger);
         const memory = util.getMemoryFlag(actionsUtil.getOptionalInput("ram") || process.env["CODEQL_RAM"], logger);
-        await (0, analyze_1.warnIfGoInstalledAfterInit)(config, logger);
+        // Check that `which go` still points at the same path it did when the `init` Action ran to ensure that no steps
-        await runAutobuildIfLegacyGoWorkflow(config, features, logger);
+        // in-between performed any setup. We encourage users to perform all setup tasks before initializing CodeQL so that
-        dbCreationTimings = await (0, analyze_1.runFinalize)(outputDir, threads, memory, codeql, config, features, logger);
+        // the setup tasks do not interfere with our analysis.
+        // Furthermore, if we installed a wrapper script in the `init` Action, we need to ensure that there isn't a step
+        // in the workflow after the `init` step which installs a different version of Go and takes precedence in the PATH,
+        // thus potentially circumventing our workaround that allows tracing to work.
+        const goInitPath = process.env[environment_1.EnvVar.GO_BINARY_LOCATION];
+        if (process.env[environment_1.EnvVar.DID_AUTOBUILD_GOLANG] !== "true" &&
+            goInitPath !== undefined) {
+            const goBinaryPath = await (0, safe_which_1.safeWhich)("go");
+            if (goInitPath !== goBinaryPath) {
+                core.warning(`Expected \`which go\` to return ${goInitPath}, but got ${goBinaryPath}: please ensure that the correct version of Go is installed before the \`codeql-action/init\` Action is used.`);
+                (0, diagnostics_1.addDiagnostic)(config, languages_1.Language.go, (0, diagnostics_1.makeDiagnostic)("go/workflow/go-installed-after-codeql-init", "Go was installed after the `codeql-action/init` Action was run", {
+                    markdownMessage: "To avoid interfering with the CodeQL analysis, perform all installation steps before calling the `github/codeql-action/init` Action.",
+                    visibility: {
+                        statusPage: true,
+                        telemetry: true,
+                        cliSummaryTable: true,
+                    },
+                    severity: "warning",
+                }));
+            }
+        }
+        await runAutobuildIfLegacyGoWorkflow(config, logger);
+        dbCreationTimings = await (0, analyze_1.runFinalize)(outputDir, threads, memory, config, logger, features);
         if (actionsUtil.getRequiredInput("skip-queries") !== "true") {
             runStats = await (0, analyze_1.runQueries)(outputDir, memory, util.getAddSnippetsFlag(actionsUtil.getRequiredInput("add-snippets")), threads, actionsUtil.getOptionalInput("category"), config, logger, features);
         }
@@ -184,7 +200,7 @@ async function run() {
         core.setOutput("sarif-output", path_1.default.resolve(outputDir));
         const uploadInput = actionsUtil.getOptionalInput("upload");
         if (runStats && actionsUtil.getUploadValue(uploadInput) === "always") {
-            uploadResult = await uploadLib.uploadFromActions(outputDir, actionsUtil.getRequiredInput("checkout_path"), actionsUtil.getOptionalInput("category"), logger);
+            uploadResult = await uploadLib.uploadFromActions(outputDir, actionsUtil.getRequiredInput("checkout_path"), actionsUtil.getOptionalInput("category"), logger, { considerInvalidRequestUserError: false });
             core.setOutput("sarif-id", uploadResult.sarifID);
         }
         else {
@@ -194,11 +210,12 @@ async function run() {
         await (0, database_upload_1.uploadDatabases)(repositoryNwo, config, apiDetails, logger);
         // Possibly upload the TRAP caches for later re-use
         const trapCacheUploadStartTime = perf_hooks_1.performance.now();
+        const codeql = await (0, codeql_1.getCodeQL)(config.codeQLCmd);
         didUploadTrapCaches = await (0, trap_caching_1.uploadTrapCaches)(codeql, config, logger);
         trapCacheUploadTime = perf_hooks_1.performance.now() - trapCacheUploadStartTime;
         // We don't upload results in test mode, so don't wait for processing
         if (util.isInTestMode()) {
-            logger.debug("In test mode. Waiting for processing is disabled.");
+            core.debug("In test mode. Waiting for processing is disabled.");
         }
         else if (uploadResult !== undefined &&
             actionsUtil.getRequiredInput("wait-for-processing") === "true") {
@@ -211,7 +228,7 @@ async function run() {
         core.exportVariable(environment_1.EnvVar.ANALYZE_DID_COMPLETE_SUCCESSFULLY, "true");
     }
     catch (unwrappedError) {
-        const error = util.wrapError(unwrappedError);
+        const error = (0, util_1.wrapError)(unwrappedError);
         if (actionsUtil.getOptionalInput("expect-error") !== "true" ||
             hasBadExpectErrorInput()) {
             core.setFailed(error.message);
@@ -244,9 +261,9 @@ async function runWrapper() {
         await exports.runPromise;
     }
     catch (error) {
-        core.setFailed(`analyze action failed: ${util.wrapError(error).message}`);
+        core.setFailed(`analyze action failed: ${(0, util_1.wrapError)(error).message}`);
     }
-    await util.checkForTimeout();
+    await (0, util_1.checkForTimeout)();
 }
 void runWrapper();
 //# sourceMappingURL=analyze-action.js.map

lib/analyze.js

@@ -26,20 +26,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runCleanup = exports.warnIfGoInstalledAfterInit = exports.runFinalize = exports.runQueries = exports.dbIsFinalized = exports.runExtraction = exports.CodeQLAnalysisError = void 0;
+exports.validateQueryFilters = exports.runCleanup = exports.runFinalize = exports.createQuerySuiteContents = exports.convertPackToQuerySuiteEntry = exports.runQueries = exports.dbIsFinalized = exports.createdDBForScannedLanguages = exports.CodeQLAnalysisError = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const perf_hooks_1 = require("perf_hooks");
-const safe_which_1 = require("@chrisgavin/safe-which");
+const toolrunner = __importStar(require("@actions/exec/lib/toolrunner"));
 const del_1 = __importDefault(require("del"));
 const yaml = __importStar(require("js-yaml"));
-const autobuild_1 = require("./autobuild");
+const analysisPaths = __importStar(require("./analysis-paths"));
 const codeql_1 = require("./codeql");
-const diagnostics_1 = require("./diagnostics");
+const configUtils = __importStar(require("./config-utils"));
-const environment_1 = require("./environment");
 const feature_flags_1 = require("./feature-flags");
 const languages_1 = require("./languages");
-const tools_features_1 = require("./tools-features");
 const tracer_config_1 = require("./tracer-config");
 const upload_lib_1 = require("./upload-lib");
 const util = __importStar(require("./util"));
@@ -52,49 +50,51 @@ class CodeQLAnalysisError extends Error {
     }
 }
 exports.CodeQLAnalysisError = CodeQLAnalysisError;
-async function setupPythonExtractor(logger) {
+async function setupPythonExtractor(logger, features, codeql) {
     const codeqlPython = process.env["CODEQL_PYTHON"];
     if (codeqlPython === undefined || codeqlPython.length === 0) {
         // If CODEQL_PYTHON is not set, no dependencies were installed, so we don't need to do anything
         return;
     }
-    logger.warning("The CODEQL_PYTHON environment variable is no longer supported. Please remove it from your workflow. This environment variable was originally used to specify a Python executable that included the dependencies of your Python code, however Python analysis no longer uses these dependencies." +
+    if (await features.getValue(feature_flags_1.Feature.DisablePythonDependencyInstallationEnabled, codeql)) {
-        "\nIf you used CODEQL_PYTHON to force the version of Python to analyze as, please use CODEQL_EXTRACTOR_PYTHON_ANALYSIS_VERSION instead, such as 'CODEQL_EXTRACTOR_PYTHON_ANALYSIS_VERSION=2.7' or 'CODEQL_EXTRACTOR_PYTHON_ANALYSIS_VERSION=3.11'.");
+        logger.warning("We recommend that you remove the CODEQL_PYTHON environment variable from your workflow. This environment variable was originally used to specify a Python executable that included the dependencies of your Python code, however Python analysis no longer uses these dependencies." +
-    return;
+            "\nIf you used CODEQL_PYTHON to force the version of Python to analyze as, please use CODEQL_EXTRACTOR_PYTHON_ANALYSIS_VERSION instead, such as 'CODEQL_EXTRACTOR_PYTHON_ANALYSIS_VERSION=2.7' or 'CODEQL_EXTRACTOR_PYTHON_ANALYSIS_VERSION=3.11'.");
+        return;
+    }
+    const scriptsFolder = path.resolve(__dirname, "../python-setup");
+    let output = "";
+    const options = {
+        listeners: {
+            stdout: (data) => {
+                output += data.toString();
+            },
+        },
+    };
+    await new toolrunner.ToolRunner(codeqlPython, [path.join(scriptsFolder, "find_site_packages.py")], options).exec();
+    logger.info(`Setting LGTM_INDEX_IMPORT_PATH=${output}`);
+    process.env["LGTM_INDEX_IMPORT_PATH"] = output;
+    output = "";
+    await new toolrunner.ToolRunner(codeqlPython, ["-c", "import sys; print(sys.version_info[0])"], options).exec();
+    logger.info(`Setting LGTM_PYTHON_SETUP_VERSION=${output}`);
+    process.env["LGTM_PYTHON_SETUP_VERSION"] = output;
 }
-async function runExtraction(codeql, config, logger) {
+async function createdDBForScannedLanguages(codeql, config, logger, features) {
+    // Insert the LGTM_INDEX_X env vars at this point so they are set when
+    // we extract any scanned languages.
+    analysisPaths.includeAndExcludeAnalysisPaths(config);
     for (const language of config.languages) {
-        if (dbIsFinalized(config, language, logger)) {
+        if ((0, languages_1.isScannedLanguage)(language) &&
-            logger.debug(`Database for ${language} has already been finalized, skipping extraction.`);
+            !dbIsFinalized(config, language, logger)) {
-            continue;
-        }
-        if (shouldExtractLanguage(config, language)) {
             logger.startGroup(`Extracting ${language}`);
             if (language === languages_1.Language.python) {
-                await setupPythonExtractor(logger);
+                await setupPythonExtractor(logger, features, codeql);
-            }
-            if (config.buildMode &&
-                (await codeql.supportsFeature(tools_features_1.ToolsFeature.TraceCommandUseBuildMode))) {
-                if (language === languages_1.Language.cpp &&
-                    config.buildMode === util_1.BuildMode.Autobuild) {
-                    await (0, autobuild_1.setupCppAutobuild)(codeql, logger);
-                }
-                await codeql.extractUsingBuildMode(config, language);
-            }
-            else {
-                await codeql.extractScannedLanguage(config, language);
             }
+            await codeql.extractScannedLanguage(config, language);
             logger.endGroup();
         }
     }
 }
-exports.runExtraction = runExtraction;
+exports.createdDBForScannedLanguages = createdDBForScannedLanguages;
-function shouldExtractLanguage(config, language) {
-    return (config.buildMode === util_1.BuildMode.None ||
-        (config.buildMode === util_1.BuildMode.Autobuild &&
-            process.env[environment_1.EnvVar.AUTOBUILD_DID_COMPLETE_SUCCESSFULLY] !== "true") ||
-        (!config.buildMode && (0, languages_1.isScannedLanguage)(language)));
-}
 function dbIsFinalized(config, language, logger) {
     const dbPath = util.getCodeQLDatabasePath(config, language);
     try {
@@ -107,9 +107,10 @@ function dbIsFinalized(config, language, logger) {
     }
 }
 exports.dbIsFinalized = dbIsFinalized;
-async function finalizeDatabaseCreation(codeql, config, threadsFlag, memoryFlag, logger) {
+async function finalizeDatabaseCreation(config, threadsFlag, memoryFlag, logger, features) {
+    const codeql = await (0, codeql_1.getCodeQL)(config.codeQLCmd);
     const extractionStart = perf_hooks_1.performance.now();
-    await runExtraction(codeql, config, logger);
+    await createdDBForScannedLanguages(codeql, config, logger, features);
     const extractionTime = perf_hooks_1.performance.now() - extractionStart;
     const trapImportStart = perf_hooks_1.performance.now();
     for (const language of config.languages) {
@@ -118,7 +119,7 @@ async function finalizeDatabaseCreation(codeql, config, threadsFlag, memoryFlag,
         }
         else {
             logger.startGroup(`Finalizing ${language}`);
-            await codeql.finalizeDatabase(util.getCodeQLDatabasePath(config, language), threadsFlag, memoryFlag, config.debugMode);
+            await codeql.finalizeDatabase(util.getCodeQLDatabasePath(config, language), threadsFlag, memoryFlag);
             logger.endGroup();
         }
     }
@@ -133,30 +134,88 @@ async function runQueries(sarifFolder, memoryFlag, addSnippetsFlag, threadsFlag,
     const statusReport = {};
     const codeql = await (0, codeql_1.getCodeQL)(config.codeQLCmd);
     const queryFlags = [memoryFlag, threadsFlag];
+    await (0, feature_flags_1.logCodeScanningConfigInCli)(codeql, features, logger);
     for (const language of config.languages) {
+        const queries = config.queries[language];
+        const queryFilters = validateQueryFilters(config.originalUserInput["query-filters"]);
+        const packsWithVersion = config.packs[language] || [];
         try {
             const sarifFile = path.join(sarifFolder, `${language}.sarif`);
-            // The work needed to generate the query suites
+            let startTimeInterpretResults;
-            // is done in the CLI. We just need to make a single
+            let endTimeInterpretResults;
-            // call to run all the queries for each language and
+            if (await (0, feature_flags_1.useCodeScanningConfigInCli)(codeql, features)) {
-            // another to interpret the results.
+                // If we are using the code scanning config in the CLI,
-            logger.startGroup(`Running queries for ${language}`);
+                // much of the work needed to generate the query suites
-            const startTimeRunQueries = new Date().getTime();
+                // is done in the CLI. We just need to make a single
-            const databasePath = util.getCodeQLDatabasePath(config, language);
+                // call to run all the queries for each language and
-            await codeql.databaseRunQueries(databasePath, queryFlags);
+                // another to interpret the results.
-            logger.debug(`Finished running queries for ${language}.`);
+                logger.startGroup(`Running queries for ${language}`);
-            // TODO should not be using `builtin` here. We should be using `all` instead.
+                const startTimeBuiltIn = new Date().getTime();
-            // The status report does not support `all` yet.
+                await runQueryGroup(language, "all", undefined, undefined, true);
-            statusReport[`analyze_builtin_queries_${language}_duration_ms`] =
+                // TODO should not be using `builtin` here. We should be using `all` instead.
-                new Date().getTime() - startTimeRunQueries;
+                // The status report does not support `all` yet.
-            logger.startGroup(`Interpreting results for ${language}`);
+                statusReport[`analyze_builtin_queries_${language}_duration_ms`] =
-            const startTimeInterpretResults = new Date();
+                    new Date().getTime() - startTimeBuiltIn;
-            const analysisSummary = await runInterpretResults(language, undefined, sarifFile, config.debugMode);
+                logger.startGroup(`Interpreting results for ${language}`);
-            const endTimeInterpretResults = new Date();
+                startTimeInterpretResults = new Date();
-            statusReport[`interpret_results_${language}_duration_ms`] =
+                const analysisSummary = await runInterpretResults(language, undefined, sarifFile, config.debugMode);
-                endTimeInterpretResults.getTime() - startTimeInterpretResults.getTime();
+                endTimeInterpretResults = new Date();
-            logger.endGroup();
+                statusReport[`interpret_results_${language}_duration_ms`] =
-            logger.info(analysisSummary);
+                    endTimeInterpretResults.getTime() -
+                        startTimeInterpretResults.getTime();
+                logger.endGroup();
+                logger.info(analysisSummary);
+            }
+            else {
+                // config was generated by the action, so must be interpreted by the action.
+                const hasBuiltinQueries = queries?.builtin.length > 0;
+                const hasCustomQueries = queries?.custom.length > 0;
+                const hasPackWithCustomQueries = packsWithVersion.length > 0;
+                if (!hasBuiltinQueries &&
+                    !hasCustomQueries &&
+                    !hasPackWithCustomQueries) {
+                    throw new util_1.UserError(`Unable to analyze ${language} as no queries were selected for this language`);
+                }
+                const customQueryIndices = [];
+                for (let i = 0; i < queries.custom.length; ++i) {
+                    if (queries.custom[i].queries.length > 0) {
+                        customQueryIndices.push(i);
+                    }
+                }
+                logger.startGroup(`Running queries for ${language}`);
+                const querySuitePaths = [];
+                if (queries.builtin.length > 0) {
+                    const startTimeBuiltIn = new Date().getTime();
+                    querySuitePaths.push((await runQueryGroup(language, "builtin", createQuerySuiteContents(queries.builtin, queryFilters), undefined, customQueryIndices.length === 0 && packsWithVersion.length === 0)));
+                    statusReport[`analyze_builtin_queries_${language}_duration_ms`] =
+                        new Date().getTime() - startTimeBuiltIn;
+                }
+                const startTimeCustom = new Date().getTime();
+                let ranCustom = false;
+                for (const i of customQueryIndices) {
+                    querySuitePaths.push((await runQueryGroup(language, `custom-${i}`, createQuerySuiteContents(queries.custom[i].queries, queryFilters), queries.custom[i].searchPath, i === customQueryIndices[customQueryIndices.length - 1] &&
+                        packsWithVersion.length === 0)));
+                    ranCustom = true;
+                }
+                if (packsWithVersion.length > 0) {
+                    querySuitePaths.push(await runQueryPacks(language, "packs", packsWithVersion, queryFilters, true));
+                    ranCustom = true;
+                }
+                if (ranCustom) {
+                    statusReport[`analyze_custom_queries_${language}_duration_ms`] =
+                        new Date().getTime() - startTimeCustom;
+                }
+                logger.endGroup();
+                logger.startGroup(`Interpreting results for ${language}`);
+                startTimeInterpretResults = new Date();
+                const analysisSummary = await runInterpretResults(language, querySuitePaths, sarifFile, config.debugMode);
+                endTimeInterpretResults = new Date();
+                statusReport[`interpret_results_${language}_duration_ms`] =
+                    endTimeInterpretResults.getTime() -
+                        startTimeInterpretResults.getTime();
+                logger.endGroup();
+                logger.info(analysisSummary);
+            }
             if (await features.getValue(feature_flags_1.Feature.QaTelemetryEnabled)) {
                 const perQueryAlertCounts = getPerQueryAlertCounts(sarifFile, logger);
                 const perQueryAlertCountEventReport = {
@@ -212,9 +271,55 @@ async function runQueries(sarifFolder, memoryFlag, addSnippetsFlag, threadsFlag,
         const databasePath = util.getCodeQLDatabasePath(config, language);
         return await codeql.databasePrintBaseline(databasePath);
     }
+    async function runQueryGroup(language, type, querySuiteContents, searchPath, optimizeForLastQueryRun) {
+        const databasePath = util.getCodeQLDatabasePath(config, language);
+        // Pass the queries to codeql using a file instead of using the command
+        // line to avoid command line length restrictions, particularly on windows.
+        const querySuitePath = querySuiteContents
+            ? `${databasePath}-queries-${type}.qls`
+            : undefined;
+        if (querySuiteContents && querySuitePath) {
+            fs.writeFileSync(querySuitePath, querySuiteContents);
+            logger.debug(`Query suite file for ${language}-${type}...\n${querySuiteContents}`);
+        }
+        await codeql.databaseRunQueries(databasePath, searchPath, querySuitePath, queryFlags, optimizeForLastQueryRun, features);
+        logger.debug(`BQRS results produced for ${language} (queries: ${type})"`);
+        return querySuitePath;
+    }
+    async function runQueryPacks(language, type, packs, queryFilters, optimizeForLastQueryRun) {
+        const databasePath = util.getCodeQLDatabasePath(config, language);
+        for (const pack of packs) {
+            logger.debug(`Running query pack for ${language}-${type}: ${pack}`);
+        }
+        // combine the list of packs into a query suite in order to run them all simultaneously.
+        const querySuite = packs.map(convertPackToQuerySuiteEntry).concat(queryFilters);
+        const querySuitePath = `${databasePath}-queries-${type}.qls`;
+        fs.writeFileSync(querySuitePath, yaml.dump(querySuite));
+        logger.debug(`BQRS results produced for ${language} (queries: ${type})"`);
+        await codeql.databaseRunQueries(databasePath, undefined, querySuitePath, queryFlags, optimizeForLastQueryRun, features);
+        return querySuitePath;
+    }
 }
 exports.runQueries = runQueries;
-async function runFinalize(outputDir, threadsFlag, memoryFlag, codeql, config, features, logger) {
+function convertPackToQuerySuiteEntry(packStr) {
+    const pack = configUtils.parsePacksSpecification(packStr);
+    return {
+        qlpack: !pack.path ? pack.name : undefined,
+        from: pack.path ? pack.name : undefined,
+        version: pack.version,
+        query: pack.path?.endsWith(".ql") ? pack.path : undefined,
+        queries: !pack.path?.endsWith(".ql") && !pack.path?.endsWith(".qls")
+            ? pack.path
+            : undefined,
+        apply: pack.path?.endsWith(".qls") ? pack.path : undefined,
+    };
+}
+exports.convertPackToQuerySuiteEntry = convertPackToQuerySuiteEntry;
+function createQuerySuiteContents(queries, queryFilters) {
+    return yaml.dump(queries.map((q) => ({ query: q })).concat(queryFilters));
+}
+exports.createQuerySuiteContents = createQuerySuiteContents;
+async function runFinalize(outputDir, threadsFlag, memoryFlag, config, logger, features) {
     try {
         await (0, del_1.default)(outputDir, { force: true });
     }
@@ -224,43 +329,17 @@ async function runFinalize(outputDir, threadsFlag, memoryFlag, codeql, config, f
         }
     }
     await fs.promises.mkdir(outputDir, { recursive: true });
-    const timings = await finalizeDatabaseCreation(codeql, config, threadsFlag, memoryFlag, logger);
+    const timings = await finalizeDatabaseCreation(config, threadsFlag, memoryFlag, logger, features);
     // WARNING: This does not _really_ end tracing, as the tracer will restore its
     // critical environment variables and it'll still be active for all processes
     // launched from this build step.
     // However, it will stop tracing for all steps past the codeql-action/analyze
     // step.
     // Delete variables as specified by the end-tracing script
-    await (0, tracer_config_1.endTracingForCluster)(codeql, config, features);
+    await (0, tracer_config_1.endTracingForCluster)(config);
     return timings;
 }
 exports.runFinalize = runFinalize;
-async function warnIfGoInstalledAfterInit(config, logger) {
-    // Check that `which go` still points at the same path it did when the `init` Action ran to ensure that no steps
-    // in-between performed any setup. We encourage users to perform all setup tasks before initializing CodeQL so that
-    // the setup tasks do not interfere with our analysis.
-    // Furthermore, if we installed a wrapper script in the `init` Action, we need to ensure that there isn't a step
-    // in the workflow after the `init` step which installs a different version of Go and takes precedence in the PATH,
-    // thus potentially circumventing our workaround that allows tracing to work.
-    const goInitPath = process.env[environment_1.EnvVar.GO_BINARY_LOCATION];
-    if (process.env[environment_1.EnvVar.DID_AUTOBUILD_GOLANG] !== "true" &&
-        goInitPath !== undefined) {
-        const goBinaryPath = await (0, safe_which_1.safeWhich)("go");
-        if (goInitPath !== goBinaryPath) {
-            logger.warning(`Expected \`which go\` to return ${goInitPath}, but got ${goBinaryPath}: please ensure that the correct version of Go is installed before the \`codeql-action/init\` Action is used.`);
-            (0, diagnostics_1.addDiagnostic)(config, languages_1.Language.go, (0, diagnostics_1.makeDiagnostic)("go/workflow/go-installed-after-codeql-init", "Go was installed after the `codeql-action/init` Action was run", {
-                markdownMessage: "To avoid interfering with the CodeQL analysis, perform all installation steps before calling the `github/codeql-action/init` Action.",
-                visibility: {
-                    statusPage: true,
-                    telemetry: true,
-                    cliSummaryTable: true,
-                },
-                severity: "warning",
-            }));
-        }
-    }
-}
-exports.warnIfGoInstalledAfterInit = warnIfGoInstalledAfterInit;
 async function runCleanup(config, cleanupLevel, logger) {
     logger.startGroup("Cleaning up databases");
     for (const language of config.languages) {
@@ -271,4 +350,28 @@ async function runCleanup(config, cleanupLevel, logger) {
     logger.endGroup();
 }
 exports.runCleanup = runCleanup;
+// exported for testing
+function validateQueryFilters(queryFilters) {
+    if (!queryFilters) {
+        return [];
+    }
+    if (!Array.isArray(queryFilters)) {
+        throw new util_1.UserError(`Query filters must be an array of "include" or "exclude" entries. Found ${typeof queryFilters}`);
+    }
+    const errors = [];
+    for (const qf of queryFilters) {
+        const keys = Object.keys(qf);
+        if (keys.length !== 1) {
+            errors.push(`Query filter must have exactly one key: ${JSON.stringify(qf)}`);
+        }
+        if (!["exclude", "include"].includes(keys[0])) {
+            errors.push(`Only "include" or "exclude" filters are allowed:\n${JSON.stringify(qf)}`);
+        }
+    }
+    if (errors.length) {
+        throw new util_1.UserError(`Invalid query filter.\n${errors.join("\n")}`);
+    }
+    return queryFilters;
+}
+exports.validateQueryFilters = validateQueryFilters;
 //# sourceMappingURL=analyze.js.map

lib/analyze.test.js

@@ -29,6 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const ava_1 = __importDefault(require("ava"));
+const yaml = __importStar(require("js-yaml"));
 const sinon = __importStar(require("sinon"));
 const analyze_1 = require("./analyze");
 const codeql_1 = require("./codeql");
@@ -39,23 +40,31 @@ const testing_utils_1 = require("./testing-utils");
 const uploadLib = __importStar(require("./upload-lib"));
 const util = __importStar(require("./util"));
 (0, testing_utils_1.setupTests)(ava_1.default);
-/**
+/** Checks that the duration fields are populated for the correct language
- * Checks the status report produced by the analyze Action.
+ * and correct case of builtin or custom. Also checks the correct search
+ * paths are set in the database analyze invocation.
  *
- * - Checks that the duration fields are populated for the correct language.
+ * Mocks the QA telemetry feature flag and checks the appropriate status report
- * - Checks that the QA telemetry status report fields are populated when the QA feature flag is enabled.
+ * fields.
  */
-(0, ava_1.default)("status report fields", async (t) => {
+(0, ava_1.default)("status report fields and search path setting", async (t) => {
+    let searchPathsUsed = [];
     return await util.withTmpDir(async (tmpDir) => {
         (0, testing_utils_1.setupActionsVars)(tmpDir, tmpDir);
         const memoryFlag = "";
         const addSnippetsFlag = "";
         const threadsFlag = "";
+        const packs = {
+            [languages_1.Language.cpp]: ["a/b@1.0.0"],
+            [languages_1.Language.java]: ["c/d@2.0.0"],
+        };
         sinon.stub(uploadLib, "validateSarifFileSchema");
         for (const language of Object.values(languages_1.Language)) {
             (0, codeql_1.setCodeQL)({
-                databaseRunQueries: async () => { },
                 packDownload: async () => ({ packs: [] }),
+                databaseRunQueries: async (_db, searchPath) => {
+                    searchPathsUsed.push(searchPath);
+                },
                 databaseInterpretResults: async (_db, _queriesRun, sarifFile) => {
                     fs.writeFileSync(sarifFile, JSON.stringify({
                         runs: [
@@ -95,26 +104,369 @@ const util = __importStar(require("./util"));
                 },
                 databasePrintBaseline: async () => "",
             });
-            const config = (0, testing_utils_1.createTestConfig)({
+            searchPathsUsed = [];
+            const config = {
                 languages: [language],
+                queries: {},
+                pathsIgnore: [],
+                paths: [],
+                originalUserInput: {},
                 tempDir: tmpDir,
+                codeQLCmd: "",
+                gitHubVersion: {
+                    type: util.GitHubVariant.DOTCOM,
+                },
                 dbLocation: path.resolve(tmpDir, "codeql_databases"),
-            });
+                packs,
+                debugMode: false,
+                debugArtifactName: util.DEFAULT_DEBUG_ARTIFACT_NAME,
+                debugDatabaseName: util.DEFAULT_DEBUG_DATABASE_NAME,
+                augmentationProperties: {
+                    packsInputCombines: false,
+                    queriesInputCombines: false,
+                },
+                trapCaches: {},
+                trapCacheDownloadTime: 0,
+            };
             fs.mkdirSync(util.getCodeQLDatabasePath(config, language), {
                 recursive: true,
             });
-            const statusReport = await (0, analyze_1.runQueries)(tmpDir, memoryFlag, addSnippetsFlag, threadsFlag, undefined, config, (0, logging_1.getRunnerLogger)(true), (0, testing_utils_1.createFeatures)([feature_flags_1.Feature.QaTelemetryEnabled]));
+            config.queries[language] = {
-            t.deepEqual(Object.keys(statusReport).sort(), [
+                builtin: ["foo.ql"],
-                `analyze_builtin_queries_${language}_duration_ms`,
+                custom: [],
-                "event_reports",
+            };
-                `interpret_results_${language}_duration_ms`,
+            const builtinStatusReport = await (0, analyze_1.runQueries)(tmpDir, memoryFlag, addSnippetsFlag, threadsFlag, undefined, config, (0, logging_1.getRunnerLogger)(true), (0, testing_utils_1.createFeatures)([feature_flags_1.Feature.QaTelemetryEnabled]));
-            ]);
+            const hasPacks = language in packs;
-            for (const eventReport of statusReport.event_reports) {
+            const statusReportKeys = Object.keys(builtinStatusReport).sort();
-                t.deepEqual(eventReport.event, "codeql database interpret-results");
+            if (hasPacks) {
-                t.true("properties" in eventReport);
+                t.deepEqual(statusReportKeys.length, 4, statusReportKeys.toString());
-                t.true("alertCounts" in eventReport.properties);
+                t.deepEqual(statusReportKeys[0], `analyze_builtin_queries_${language}_duration_ms`);
+                t.deepEqual(statusReportKeys[1], `analyze_custom_queries_${language}_duration_ms`);
+                t.deepEqual(statusReportKeys[2], "event_reports");
+                t.deepEqual(statusReportKeys[3], `interpret_results_${language}_duration_ms`);
+            }
+            else {
+                t.deepEqual(statusReportKeys[0], `analyze_builtin_queries_${language}_duration_ms`);
+                t.deepEqual(statusReportKeys[1], "event_reports");
+                t.deepEqual(statusReportKeys[2], `interpret_results_${language}_duration_ms`);
+            }
+            if (builtinStatusReport.event_reports) {
+                for (const eventReport of builtinStatusReport.event_reports) {
+                    t.deepEqual(eventReport.event, "codeql database interpret-results");
+                    t.true("properties" in eventReport);
+                    t.true("alertCounts" in eventReport.properties);
+                }
+            }
+            config.queries[language] = {
+                builtin: [],
+                custom: [
+                    {
+                        queries: ["foo.ql"],
+                        searchPath: "/1",
+                    },
+                    {
+                        queries: ["bar.ql"],
+                        searchPath: "/2",
+                    },
+                ],
+            };
+            const customStatusReport = await (0, analyze_1.runQueries)(tmpDir, memoryFlag, addSnippetsFlag, threadsFlag, undefined, config, (0, logging_1.getRunnerLogger)(true), (0, testing_utils_1.createFeatures)([feature_flags_1.Feature.QaTelemetryEnabled]));
+            t.deepEqual(Object.keys(customStatusReport).length, 3);
+            t.true(`analyze_custom_queries_${language}_duration_ms` in customStatusReport);
+            const expectedSearchPathsUsed = hasPacks
+                ? [undefined, undefined, "/1", "/2", undefined]
+                : [undefined, "/1", "/2"];
+            t.deepEqual(searchPathsUsed, expectedSearchPathsUsed);
+            t.true(`interpret_results_${language}_duration_ms` in customStatusReport);
+            t.true("event_reports" in customStatusReport);
+            if (customStatusReport.event_reports) {
+                for (const eventReport of customStatusReport.event_reports) {
+                    t.deepEqual(eventReport.event, "codeql database interpret-results");
+                    t.true("properties" in eventReport);
+                    t.true("alertCounts" in eventReport.properties);
+                }
             }
         }
+        verifyQuerySuites(tmpDir);
+    });
+    function verifyQuerySuites(tmpDir) {
+        const qlsContent = [
+            {
+                query: "foo.ql",
+            },
+        ];
+        const qlsContent2 = [
+            {
+                query: "bar.ql",
+            },
+        ];
+        for (const lang of Object.values(languages_1.Language)) {
+            t.deepEqual(readContents(`${lang}-queries-builtin.qls`), qlsContent);
+            t.deepEqual(readContents(`${lang}-queries-custom-0.qls`), qlsContent);
+            t.deepEqual(readContents(`${lang}-queries-custom-1.qls`), qlsContent2);
+        }
+        function readContents(name) {
+            const x = fs.readFileSync(path.join(tmpDir, "codeql_databases", name), "utf8");
+            console.log(x);
+            return yaml.load(fs.readFileSync(path.join(tmpDir, "codeql_databases", name), "utf8"));
+        }
+    }
+});
+function mockCodeQL() {
+    return {
+        getVersion: async () => (0, testing_utils_1.makeVersionInfo)("1.0.0"),
+        databaseRunQueries: sinon.spy(),
+        databaseInterpretResults: async () => "",
+        databasePrintBaseline: async () => "",
+    };
+}
+function createBaseConfig(tmpDir) {
+    return {
+        languages: [],
+        queries: {},
+        pathsIgnore: [],
+        paths: [],
+        originalUserInput: {},
+        tempDir: "tempDir",
+        codeQLCmd: "",
+        gitHubVersion: {
+            type: util.GitHubVariant.DOTCOM,
+        },
+        dbLocation: path.resolve(tmpDir, "codeql_databases"),
+        packs: {},
+        debugMode: false,
+        debugArtifactName: util.DEFAULT_DEBUG_ARTIFACT_NAME,
+        debugDatabaseName: util.DEFAULT_DEBUG_DATABASE_NAME,
+        augmentationProperties: {
+            packsInputCombines: false,
+            queriesInputCombines: false,
+        },
+        trapCaches: {},
+        trapCacheDownloadTime: 0,
+    };
+}
+function createQueryConfig(builtin, custom) {
+    return {
+        builtin,
+        custom: custom.map((c) => ({ searchPath: "/search", queries: [c] })),
+    };
+}
+async function runQueriesWithConfig(config, features) {
+    for (const language of config.languages) {
+        fs.mkdirSync(util.getCodeQLDatabasePath(config, language), {
+            recursive: true,
+        });
+    }
+    return (0, analyze_1.runQueries)("sarif-folder", "--memFlag", "--addSnippetsFlag", "--threadsFlag", undefined, config, (0, logging_1.getRunnerLogger)(true), (0, testing_utils_1.createFeatures)(features));
+}
+function getDatabaseRunQueriesCalls(mock) {
+    return mock.databaseRunQueries.getCalls();
+}
+(0, ava_1.default)("optimizeForLastQueryRun for one language", async (t) => {
+    return await util.withTmpDir(async (tmpDir) => {
+        const codeql = mockCodeQL();
+        (0, codeql_1.setCodeQL)(codeql);
+        const config = createBaseConfig(tmpDir);
+        config.languages = [languages_1.Language.cpp];
+        config.queries.cpp = createQueryConfig(["foo.ql"], []);
+        await runQueriesWithConfig(config, []);
+        t.deepEqual(getDatabaseRunQueriesCalls(codeql).map((c) => c.args[4]), [true]);
     });
 });
+(0, ava_1.default)("optimizeForLastQueryRun for two languages", async (t) => {
+    return await util.withTmpDir(async (tmpDir) => {
+        const codeql = mockCodeQL();
+        (0, codeql_1.setCodeQL)(codeql);
+        const config = createBaseConfig(tmpDir);
+        config.languages = [languages_1.Language.cpp, languages_1.Language.java];
+        config.queries.cpp = createQueryConfig(["foo.ql"], []);
+        config.queries.java = createQueryConfig(["bar.ql"], []);
+        await runQueriesWithConfig(config, []);
+        t.deepEqual(getDatabaseRunQueriesCalls(codeql).map((c) => c.args[4]), [true, true]);
+    });
+});
+(0, ava_1.default)("optimizeForLastQueryRun for two languages, with custom queries", async (t) => {
+    return await util.withTmpDir(async (tmpDir) => {
+        const codeql = mockCodeQL();
+        (0, codeql_1.setCodeQL)(codeql);
+        const config = createBaseConfig(tmpDir);
+        config.languages = [languages_1.Language.cpp, languages_1.Language.java];
+        config.queries.cpp = createQueryConfig(["foo.ql"], ["c1.ql", "c2.ql"]);
+        config.queries.java = createQueryConfig(["bar.ql"], ["c3.ql"]);
+        await runQueriesWithConfig(config, []);
+        t.deepEqual(getDatabaseRunQueriesCalls(codeql).map((c) => c.args[4]), [false, false, true, false, true]);
+    });
+});
+(0, ava_1.default)("optimizeForLastQueryRun for two languages, with custom queries and packs", async (t) => {
+    return await util.withTmpDir(async (tmpDir) => {
+        const codeql = mockCodeQL();
+        (0, codeql_1.setCodeQL)(codeql);
+        const config = createBaseConfig(tmpDir);
+        config.languages = [languages_1.Language.cpp, languages_1.Language.java];
+        config.queries.cpp = createQueryConfig(["foo.ql"], ["c1.ql", "c2.ql"]);
+        config.queries.java = createQueryConfig(["bar.ql"], ["c3.ql"]);
+        config.packs.cpp = ["a/cpp-pack1@0.1.0"];
+        config.packs.java = ["b/java-pack1@0.2.0", "b/java-pack2@0.3.3"];
+        await runQueriesWithConfig(config, []);
+        t.deepEqual(getDatabaseRunQueriesCalls(codeql).map((c) => c.args[4]), [false, false, false, true, false, false, true]);
+    });
+});
+(0, ava_1.default)("optimizeForLastQueryRun for one language, CliConfigFileEnabled", async (t) => {
+    return await util.withTmpDir(async (tmpDir) => {
+        const codeql = mockCodeQL();
+        (0, codeql_1.setCodeQL)(codeql);
+        const config = createBaseConfig(tmpDir);
+        config.languages = [languages_1.Language.cpp];
+        await runQueriesWithConfig(config, [feature_flags_1.Feature.CliConfigFileEnabled]);
+        t.deepEqual(getDatabaseRunQueriesCalls(codeql).map((c) => c.args[4]), [true]);
+    });
+});
+(0, ava_1.default)("optimizeForLastQueryRun for two languages, CliConfigFileEnabled", async (t) => {
+    return await util.withTmpDir(async (tmpDir) => {
+        const codeql = mockCodeQL();
+        (0, codeql_1.setCodeQL)(codeql);
+        const config = createBaseConfig(tmpDir);
+        config.languages = [languages_1.Language.cpp, languages_1.Language.java];
+        await runQueriesWithConfig(config, [feature_flags_1.Feature.CliConfigFileEnabled]);
+        t.deepEqual(getDatabaseRunQueriesCalls(codeql).map((c) => c.args[4]), [true, true]);
+    });
+});
+(0, ava_1.default)("validateQueryFilters", (t) => {
+    t.notThrows(() => (0, analyze_1.validateQueryFilters)([]));
+    t.notThrows(() => (0, analyze_1.validateQueryFilters)(undefined));
+    t.notThrows(() => {
+        return (0, analyze_1.validateQueryFilters)([
+            {
+                exclude: {
+                    "problem.severity": "recommendation",
+                },
+            },
+            {
+                exclude: {
+                    "tags contain": ["foo", "bar"],
+                },
+            },
+            {
+                include: {
+                    "problem.severity": "something-to-think-about",
+                },
+            },
+            {
+                include: {
+                    "tags contain": ["baz", "bop"],
+                },
+            },
+        ]);
+    });
+    t.throws(() => {
+        return (0, analyze_1.validateQueryFilters)([
+            {
+                exclude: {
+                    "tags contain": ["foo", "bar"],
+                },
+                include: {
+                    "tags contain": ["baz", "bop"],
+                },
+            },
+        ]);
+    }, { message: /Query filter must have exactly one key/ });
+    t.throws(() => {
+        return (0, analyze_1.validateQueryFilters)([{ xxx: "foo" }]);
+    }, { message: /Only "include" or "exclude" filters are allowed/ });
+    t.throws(() => {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+        return (0, analyze_1.validateQueryFilters)({ exclude: "foo" });
+    }, {
+        message: /Query filters must be an array of "include" or "exclude" entries/,
+    });
+});
+const convertPackToQuerySuiteEntryMacro = ava_1.default.macro({
+    exec: (t, packSpec, suiteEntry) => t.deepEqual((0, analyze_1.convertPackToQuerySuiteEntry)(packSpec), suiteEntry),
+    title: (_providedTitle, packSpec) => `Query Suite Entry: ${packSpec}`,
+});
+(0, ava_1.default)(convertPackToQuerySuiteEntryMacro, "a/b", {
+    qlpack: "a/b",
+    from: undefined,
+    version: undefined,
+    query: undefined,
+    queries: undefined,
+    apply: undefined,
+});
+(0, ava_1.default)(convertPackToQuerySuiteEntryMacro, "a/b@~1.2.3", {
+    qlpack: "a/b",
+    from: undefined,
+    version: "~1.2.3",
+    query: undefined,
+    queries: undefined,
+    apply: undefined,
+});
+(0, ava_1.default)(convertPackToQuerySuiteEntryMacro, "a/b:my/path", {
+    qlpack: undefined,
+    from: "a/b",
+    version: undefined,
+    query: undefined,
+    queries: "my/path",
+    apply: undefined,
+});
+(0, ava_1.default)(convertPackToQuerySuiteEntryMacro, "a/b@~1.2.3:my/path", {
+    qlpack: undefined,
+    from: "a/b",
+    version: "~1.2.3",
+    query: undefined,
+    queries: "my/path",
+    apply: undefined,
+});
+(0, ava_1.default)(convertPackToQuerySuiteEntryMacro, "a/b:my/path/query.ql", {
+    qlpack: undefined,
+    from: "a/b",
+    version: undefined,
+    query: "my/path/query.ql",
+    queries: undefined,
+    apply: undefined,
+});
+(0, ava_1.default)(convertPackToQuerySuiteEntryMacro, "a/b@~1.2.3:my/path/query.ql", {
+    qlpack: undefined,
+    from: "a/b",
+    version: "~1.2.3",
+    query: "my/path/query.ql",
+    queries: undefined,
+    apply: undefined,
+});
+(0, ava_1.default)(convertPackToQuerySuiteEntryMacro, "a/b:my/path/suite.qls", {
+    qlpack: undefined,
+    from: "a/b",
+    version: undefined,
+    query: undefined,
+    queries: undefined,
+    apply: "my/path/suite.qls",
+});
+(0, ava_1.default)(convertPackToQuerySuiteEntryMacro, "a/b@~1.2.3:my/path/suite.qls", {
+    qlpack: undefined,
+    from: "a/b",
+    version: "~1.2.3",
+    query: undefined,
+    queries: undefined,
+    apply: "my/path/suite.qls",
+});
+(0, ava_1.default)("convertPackToQuerySuiteEntry Failure", (t) => {
+    t.throws(() => (0, analyze_1.convertPackToQuerySuiteEntry)("this-is-not-a-pack"));
+});
+(0, ava_1.default)("createQuerySuiteContents", (t) => {
+    const yamlResult = (0, analyze_1.createQuerySuiteContents)(["query1.ql", "query2.ql"], [
+        {
+            exclude: { "problem.severity": "recommendation" },
+        },
+        {
+            include: { "problem.severity": "recommendation" },
+        },
+    ]);
+    const expected = `- query: query1.ql
+- query: query2.ql
+- exclude:
+    problem.severity: recommendation
+- include:
+    problem.severity: recommendation
+`;
+    t.deepEqual(yamlResult, expected);
+});
 //# sourceMappingURL=analyze.test.js.map

lib/api-client.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.wrapApiConfigurationError = exports.computeAutomationID = exports.getAutomationID = exports.getAnalysisKey = exports.getWorkflowRelativePath = exports.getGitHubVersion = exports.getGitHubVersionFromApi = exports.getApiClientWithExternalAuth = exports.getApiClient = exports.getApiDetails = exports.DisallowedAPIVersionReason = void 0;
+exports.computeAutomationID = exports.getAutomationID = exports.getAnalysisKey = exports.getWorkflowRelativePath = exports.getGitHubVersion = exports.getGitHubVersionFromApi = exports.getApiClientWithExternalAuth = exports.getApiClient = exports.getApiDetails = exports.DisallowedAPIVersionReason = void 0;
 const core = __importStar(require("@actions/core"));
 const githubUtils = __importStar(require("@actions/github/lib/utils"));
 const retry = __importStar(require("@octokit/plugin-retry"));
@@ -78,6 +78,9 @@ async function getGitHubVersionFromApi(apiClient, apiDetails) {
     if (response.headers[GITHUB_ENTERPRISE_VERSION_HEADER] === undefined) {
         return { type: util_1.GitHubVariant.DOTCOM };
     }
+    if (response.headers[GITHUB_ENTERPRISE_VERSION_HEADER] === "GitHub AE") {
+        return { type: util_1.GitHubVariant.GHAE };
+    }
     if (response.headers[GITHUB_ENTERPRISE_VERSION_HEADER] === "ghe.com") {
         return { type: util_1.GitHubVariant.GHE_DOTCOM };
     }
@@ -163,15 +166,4 @@ function computeAutomationID(analysis_key, environment) {
     return automationID;
 }
 exports.computeAutomationID = computeAutomationID;
-function wrapApiConfigurationError(e) {
-    if ((0, util_1.isHTTPError)(e)) {
-        if (e.message.includes("API rate limit exceeded for site ID installation") ||
-            e.message.includes("commit not found") ||
-            /^ref .* not found in this repository$/.test(e.message)) {
-            return new util_1.ConfigurationError(e.message);
-        }
-    }
-    return e;
-}
-exports.wrapApiConfigurationError = wrapApiConfigurationError;
 //# sourceMappingURL=api-client.js.map

lib/api-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"api-client.js","sourceRoot":"","sources":["../src/api-client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"api-client.js","sourceRoot":"","sources":["../src/api-client.ts"],"names":[],"mappings":"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"}

lib/api-client.test.js

@@ -92,6 +92,15 @@ function mockGetMetaVersionHeader(versionHeader) {
     });
     t.deepEqual({ type: util.GitHubVariant.GHES, version: "2.0" }, v2);
 });
+(0, ava_1.default)("getGitHubVersion for GHAE", async (t) => {
+    mockGetMetaVersionHeader("GitHub AE");
+    const ghae = await api.getGitHubVersionFromApi(api.getApiClient(), {
+        auth: "",
+        url: "https://example.githubenterprise.com",
+        apiURL: undefined,
+    });
+    t.deepEqual({ type: util.GitHubVariant.GHAE }, ghae);
+});
 (0, ava_1.default)("getGitHubVersion for different domain", async (t) => {
     mockGetMetaVersionHeader(undefined);
     const v3 = await api.getGitHubVersionFromApi(api.getApiClient(), {

lib/api-client.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"api-client.test.js","sourceRoot":"","sources":["../src/api-client.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"api-client.test.js","sourceRoot":"","sources":["../src/api-client.test.ts"],"names":[],"mappings":"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"}

lib/api-compatibility.json

@@ -1 +1 @@
-{ "maximumVersion": "3.13", "minimumVersion": "3.9" }
+{ "maximumVersion": "3.12", "minimumVersion": "3.7" }

lib/autobuild-action.js

@@ -27,49 +27,37 @@ const core = __importStar(require("@actions/core"));
 const actions_util_1 = require("./actions-util");
 const api_client_1 = require("./api-client");
 const autobuild_1 = require("./autobuild");
-const codeql_1 = require("./codeql");
+const configUtils = __importStar(require("./config-utils"));
-const config_utils_1 = require("./config-utils");
-const environment_1 = require("./environment");
-const feature_flags_1 = require("./feature-flags");
 const logging_1 = require("./logging");
-const repository_1 = require("./repository");
 const status_report_1 = require("./status-report");
 const util_1 = require("./util");
-async function sendCompletedStatusReport(config, logger, startedAt, allLanguages, failingLanguage, cause) {
+async function sendCompletedStatusReport(logger, startedAt, allLanguages, failingLanguage, cause) {
     (0, util_1.initializeEnvironment)((0, actions_util_1.getActionVersion)());
     const status = (0, status_report_1.getActionsStatus)(cause, failingLanguage);
-    const statusReportBase = await (0, status_report_1.createStatusReportBase)(status_report_1.ActionName.Autobuild, status, startedAt, config, await (0, util_1.checkDiskUsage)(logger), logger, cause?.message, cause?.stack);
+    const statusReportBase = await (0, status_report_1.createStatusReportBase)("autobuild", status, startedAt, await (0, util_1.checkDiskUsage)(logger), cause?.message, cause?.stack);
-    if (statusReportBase !== undefined) {
+    const statusReport = {
-        const statusReport = {
+        ...statusReportBase,
-            ...statusReportBase,
+        autobuild_languages: allLanguages.join(","),
-            autobuild_languages: allLanguages.join(","),
+        autobuild_failure: failingLanguage,
-            autobuild_failure: failingLanguage,
+    };
-        };
+    await (0, status_report_1.sendStatusReport)(statusReport);
-        await (0, status_report_1.sendStatusReport)(statusReport);
-    }
 }
 async function run() {
     const startedAt = new Date();
     const logger = (0, logging_1.getActionsLogger)();
-    let config;
+    let currentLanguage = undefined;
-    let currentLanguage;
+    let languages = undefined;
-    let languages;
     try {
-        const statusReportBase = await (0, status_report_1.createStatusReportBase)(status_report_1.ActionName.Autobuild, "starting", startedAt, config, await (0, util_1.checkDiskUsage)(logger), logger);
+        if (!(await (0, status_report_1.sendStatusReport)(await (0, status_report_1.createStatusReportBase)("autobuild", "starting", startedAt, await (0, util_1.checkDiskUsage)(logger))))) {
-        if (statusReportBase !== undefined) {
+            return;
-            await (0, status_report_1.sendStatusReport)(statusReportBase);
         }
         const gitHubVersion = await (0, api_client_1.getGitHubVersion)();
         (0, util_1.checkGitHubVersionInRange)(gitHubVersion, logger);
-        (0, util_1.checkActionVersion)((0, actions_util_1.getActionVersion)(), gitHubVersion);
+        const config = await configUtils.getConfig((0, actions_util_1.getTemporaryDirectory)(), logger);
-        const repositoryNwo = (0, repository_1.parseRepositoryNwo)((0, util_1.getRequiredEnvParam)("GITHUB_REPOSITORY"));
-        const features = new feature_flags_1.Features(gitHubVersion, repositoryNwo, (0, actions_util_1.getTemporaryDirectory)(), logger);
-        config = await (0, config_utils_1.getConfig)((0, actions_util_1.getTemporaryDirectory)(), logger);
         if (config === undefined) {
             throw new Error("Config file could not be found at expected location. Has the 'init' action been called?");
         }
-        const codeql = await (0, codeql_1.getCodeQL)(config.codeQLCmd);
+        languages = await (0, autobuild_1.determineAutobuildLanguages)(config, logger);
-        languages = await (0, autobuild_1.determineAutobuildLanguages)(codeql, config, logger);
         if (languages !== undefined) {
             const workingDirectory = (0, actions_util_1.getOptionalInput)("working-directory");
             if (workingDirectory) {
@@ -78,18 +66,17 @@ async function run() {
             }
             for (const language of languages) {
                 currentLanguage = language;
-                await (0, autobuild_1.runAutobuild)(config, language, features, logger);
+                await (0, autobuild_1.runAutobuild)(language, config, logger);
             }
         }
     }
     catch (unwrappedError) {
         const error = (0, util_1.wrapError)(unwrappedError);
         core.setFailed(`We were unable to automatically build your code. Please replace the call to the autobuild action with your custom build steps. ${error.message}`);
-        await sendCompletedStatusReport(config, logger, startedAt, languages ?? [], currentLanguage, error);
+        await sendCompletedStatusReport(logger, startedAt, languages ?? [], currentLanguage, error);
         return;
     }
-    core.exportVariable(environment_1.EnvVar.AUTOBUILD_DID_COMPLETE_SUCCESSFULLY, "true");
+    await sendCompletedStatusReport(logger, startedAt, languages ?? []);
-    await sendCompletedStatusReport(config, logger, startedAt, languages ?? []);
 }
 async function runWrapper() {
     try {

lib/autobuild-action.js.map

@@ -1 +1 @@
-{"version":3,"file":"autobuild-action.js","sourceRoot":"","sources":["../src/autobuild-action.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"autobuild-action.js","sourceRoot":"","sources":["../src/autobuild-action.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAsC;AAEtC,iDAIwB;AACxB,6CAAgD;AAChD,2CAAwE;AACxE,4DAA8C;AAE9C,uCAAqD;AACrD,mDAKyB;AACzB,iCAKgB;AAShB,KAAK,UAAU,yBAAyB,CACtC,MAAc,EACd,SAAe,EACf,YAAsB,EACtB,eAAwB,EACxB,KAAa;IAEb,IAAA,4BAAqB,EAAC,IAAA,+BAAgB,GAAE,CAAC,CAAC;IAE1C,MAAM,MAAM,GAAG,IAAA,gCAAgB,EAAC,KAAK,EAAE,eAAe,CAAC,CAAC;IACxD,MAAM,gBAAgB,GAAG,MAAM,IAAA,sCAAsB,EACnD,WAAW,EACX,MAAM,EACN,SAAS,EACT,MAAM,IAAA,qBAAc,EAAC,MAAM,CAAC,EAC5B,KAAK,EAAE,OAAO,EACd,KAAK,EAAE,KAAK,CACb,CAAC;IACF,MAAM,YAAY,GAA0B;QAC1C,GAAG,gBAAgB;QACnB,mBAAmB,EAAE,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC;QAC3C,iBAAiB,EAAE,eAAe;KACnC,CAAC;IACF,MAAM,IAAA,gCAAgB,EAAC,YAAY,CAAC,CAAC;AACvC,CAAC;AAED,KAAK,UAAU,GAAG;IAChB,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC;IAC7B,MAAM,MAAM,GAAG,IAAA,0BAAgB,GAAE,CAAC;IAClC,IAAI,eAAe,GAAyB,SAAS,CAAC;IACtD,IAAI,SAAS,GAA2B,SAAS,CAAC;IAClD,IAAI,CAAC;QACH,IACE,CAAC,CAAC,MAAM,IAAA,gCAAgB,EACtB,MAAM,IAAA,sCAAsB,EAC1B,WAAW,EACX,UAAU,EACV,SAAS,EACT,MAAM,IAAA,qBAAc,EAAC,MAAM,CAAC,CAC7B,CACF,CAAC,EACF,CAAC;YACD,OAAO;QACT,CAAC;QAED,MAAM,aAAa,GAAG,MAAM,IAAA,6BAAgB,GAAE,CAAC;QAC/C,IAAA,gCAAyB,EAAC,aAAa,EAAE,MAAM,CAAC,CAAC;QAEjD,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,IAAA,oCAAqB,GAAE,EAAE,MAAM,CAAC,CAAC;QAC5E,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CACb,yFAAyF,CAC1F,CAAC;QACJ,CAAC;QAED,SAAS,GAAG,MAAM,IAAA,uCAA2B,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9D,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC5B,MAAM,gBAAgB,GAAG,IAAA,+BAAgB,EAAC,mBAAmB,CAAC,CAAC;YAC/D,IAAI,gBAAgB,EAAE,CAAC;gBACrB,MAAM,CAAC,IAAI,CACT,6CAA6C,gBAAgB,EAAE,CAChE,CAAC;gBACF,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;YAClC,CAAC;YACD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;gBACjC,eAAe,GAAG,QAAQ,CAAC;gBAC3B,MAAM,IAAA,wBAAY,EAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;YAC/C,CAAC;QACH,CAAC;IACH,CAAC;IAAC,OAAO,cAAc,EAAE,CAAC;QACxB,MAAM,KAAK,GAAG,IAAA,gBAAS,EAAC,cAAc,CAAC,CAAC;QACxC,IAAI,CAAC,SAAS,CACZ,kIAAkI,KAAK,CAAC,OAAO,EAAE,CAClJ,CAAC;QACF,MAAM,yBAAyB,CAC7B,MAAM,EACN,SAAS,EACT,SAAS,IAAI,EAAE,EACf,eAAe,EACf,KAAK,CACN,CAAC;QACF,OAAO;IACT,CAAC;IAED,MAAM,yBAAyB,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,IAAI,EAAE,CAAC,CAAC;AACtE,CAAC;AAED,KAAK,UAAU,UAAU;IACvB,IAAI,CAAC;QACH,MAAM,GAAG,EAAE,CAAC;IACd,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,SAAS,CAAC,4BAA4B,IAAA,gBAAS,EAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;IACzE,CAAC;AACH,CAAC;AAED,KAAK,UAAU,EAAE,CAAC"}

lib/autobuild.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runAutobuild = exports.setupCppAutobuild = exports.determineAutobuildLanguages = void 0;
+exports.runAutobuild = exports.determineAutobuildLanguages = void 0;
 const core = __importStar(require("@actions/core"));
 const actions_util_1 = require("./actions-util");
 const api_client_1 = require("./api-client");
@@ -32,15 +32,8 @@ const environment_1 = require("./environment");
 const feature_flags_1 = require("./feature-flags");
 const languages_1 = require("./languages");
 const repository_1 = require("./repository");
-const tools_features_1 = require("./tools-features");
 const util_1 = require("./util");
-async function determineAutobuildLanguages(codeql, config, logger) {
+async function determineAutobuildLanguages(config, logger) {
-    if ((config.buildMode === util_1.BuildMode.None &&
-        (await codeql.supportsFeature(tools_features_1.ToolsFeature.TraceCommandUseBuildMode))) ||
-        config.buildMode === util_1.BuildMode.Manual) {
-        logger.info(`Using ${config.buildMode} build mode, nothing to autobuild.`);
-        return undefined;
-    }
     // Attempt to find a language to autobuild
     // We want pick the dominant language in the repo from the ones we're able to build
     // The languages are sorted in order specified by user or by lines of code if we got
@@ -133,20 +126,13 @@ async function setupCppAutobuild(codeql, logger) {
         core.exportVariable(envVar, "false");
     }
 }
-exports.setupCppAutobuild = setupCppAutobuild;
+async function runAutobuild(language, config, logger) {
-async function runAutobuild(config, language, features, logger) {
     logger.startGroup(`Attempting to automatically build ${language} code`);
     const codeQL = await (0, codeql_1.getCodeQL)(config.codeQLCmd);
     if (language === languages_1.Language.cpp) {
         await setupCppAutobuild(codeQL, logger);
     }
-    if (config.buildMode &&
+    await codeQL.runAutobuild(language);
-        (await features.getValue(feature_flags_1.Feature.AutobuildDirectTracingEnabled, codeQL))) {
-        await codeQL.extractUsingBuildMode(config, language);
-    }
-    else {
-        await codeQL.runAutobuild(config, language, features);
-    }
     if (language === languages_1.Language.go) {
         core.exportVariable(environment_1.EnvVar.DID_AUTOBUILD_GOLANG, "true");
     }

lib/autobuild.js.map

@@ -1 +1 @@
-{"version":3,"file":"autobuild.js","sourceRoot":"","sources":["../src/autobuild.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"autobuild.js","sourceRoot":"","sources":["../src/autobuild.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAsC;AAEtC,iDAA6E;AAC7E,6CAAgD;AAChD,qCAA6C;AAE7C,+CAAuC;AACvC,mDAAmE;AACnE,2CAAyD;AAEzD,6CAAkD;AAClD,iCAA6C;AAEtC,KAAK,UAAU,2BAA2B,CAC/C,MAA0B,EAC1B,MAAc;IAEd,0CAA0C;IAC1C,mFAAmF;IACnF,oFAAoF;IACpF,4EAA4E;IAC5E,MAAM,kBAAkB,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CACvD,IAAA,4BAAgB,EAAC,CAAC,CAAC,CACpB,CAAC;IAEF,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,MAAM,CAAC,IAAI,CACT,iEAAiE,CAClE,CAAC;QACF,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;OA0BG;IACH,MAAM,2BAA2B,GAAG,kBAAkB,CAAC,MAAM,CAC3D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,oBAAQ,CAAC,EAAE,CACzB,CAAC;IAEF,MAAM,SAAS,GAAe,EAAE,CAAC;IACjC,yEAAyE;IACzE,UAAU;IACV,IAAI,2BAA2B,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;QACjD,SAAS,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC,CAAC,CAAC,CAAC;IACjD,CAAC;IACD,uEAAuE;IACvE,wCAAwC;IACxC,IAAI,kBAAkB,CAAC,MAAM,KAAK,2BAA2B,CAAC,MAAM,EAAE,CAAC;QACrE,SAAS,CAAC,IAAI,CAAC,oBAAQ,CAAC,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,kBAAkB,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAE3D,2EAA2E;IAC3E,4EAA4E;IAC5E,2CAA2C;IAC3C,uEAAuE;IACvE,2EAA2E;IAC3E,uEAAuE;IACvE,yCAAyC;IACzC,IAAI,2BAA2B,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3C,MAAM,CAAC,OAAO,CACZ,oCAAoC,SAAS,CAAC,IAAI,CAChD,OAAO,CACR,8BAA8B,2BAA2B;aACvD,KAAK,CAAC,CAAC,CAAC;aACR,IAAI,CACH,OAAO,CACR,kFAAkF;YACnF,4BAA4B;YAC5B,0NAA0N,CAC7N,CAAC;IACJ,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAtFD,kEAsFC;AAED,KAAK,UAAU,iBAAiB,CAAC,MAAc,EAAE,MAAc;IAC7D,MAAM,MAAM,GAAG,6BAAa,CAAC,uBAAO,CAAC,yBAAyB,CAAC,CAAC,MAAM,CAAC;IACvE,MAAM,WAAW,GAAG,4CAA4C,CAAC;IACjE,MAAM,MAAM,GACV,wHAAwH,CAAC;IAC3H,MAAM,aAAa,GAAG,MAAM,IAAA,6BAAgB,GAAE,CAAC;IAC/C,MAAM,aAAa,GAAG,IAAA,+BAAkB,EACtC,IAAA,0BAAmB,EAAC,mBAAmB,CAAC,CACzC,CAAC;IACF,MAAM,QAAQ,GAAG,IAAI,wBAAQ,CAC3B,aAAa,EACb,aAAa,EACb,IAAA,oCAAqB,GAAE,EACvB,MAAM,CACP,CAAC;IACF,IAAI,MAAM,QAAQ,CAAC,QAAQ,CAAC,uBAAO,CAAC,yBAAyB,EAAE,MAAM,CAAC,EAAE,CAAC;QACvE,yEAAyE;QACzE,IACE,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,KAAK,aAAa;YACnD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,MAAM,EAC9B,CAAC;YACD,MAAM,CAAC,IAAI,CACT,aAAa,WAAW,sCACtB,IAAA,mCAAoB,GAAE,KAAK,SAAS;gBAClC,CAAC,CAAC,8BAA8B,MAAM,yDAAyD,MAAM,IAAI;gBACzG,CAAC,CAAC,EACN,EAAE,CACH,CAAC;YACF,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACvC,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,IAAI,CACT,YAAY,WAAW,yCAAyC,MAAM,yCAAyC,MAAM,IAAI,CAC1H,CAAC;YACF,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,IAAI,CAAC,aAAa,WAAW,GAAG,CAAC,CAAC;QACzC,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,YAAY,CAChC,QAAkB,EAClB,MAA0B,EAC1B,MAAc;IAEd,MAAM,CAAC,UAAU,CAAC,qCAAqC,QAAQ,OAAO,CAAC,CAAC;IACxE,MAAM,MAAM,GAAG,MAAM,IAAA,kBAAS,EAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACjD,IAAI,QAAQ,KAAK,oBAAQ,CAAC,GAAG,EAAE,CAAC;QAC9B,MAAM,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,CAAC;IACD,MAAM,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;IACpC,IAAI,QAAQ,KAAK,oBAAQ,CAAC,EAAE,EAAE,CAAC;QAC7B,IAAI,CAAC,cAAc,CAAC,oBAAM,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;IAC3D,CAAC;IACD,MAAM,CAAC,QAAQ,EAAE,CAAC;AACpB,CAAC;AAfD,oCAeC"}

lib/cli-errors.js

@@ -1,246 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.wrapCliConfigurationError = exports.getCliConfigCategoryIfExists = exports.cliErrorsConfig = exports.CliConfigErrorCategory = exports.CommandInvocationError = void 0;
-const util_1 = require("./util");
-/**
- * A class of Error that we can classify as an error stemming from a CLI
- * invocation, with associated exit code, stderr,etc.
- */
-class CommandInvocationError extends Error {
-    constructor(cmd, args, exitCode, stderr, stdout) {
-        const prettyCommand = [cmd, ...args]
-            .map((x) => (x.includes(" ") ? `'${x}'` : x))
-            .join(" ");
-        const fatalErrors = extractFatalErrors(stderr);
-        const autobuildErrors = extractAutobuildErrors(stderr);
-        let message;
-        if (fatalErrors) {
-            message =
-                `Encountered a fatal error while running "${prettyCommand}". ` +
-                    `Exit code was ${exitCode} and error was: ${fatalErrors.trim()} See the logs for more details.`;
-        }
-        else if (autobuildErrors) {
-            const autobuildHelpLink = "https://docs.github.com/en/code-security/code-scanning/troubleshooting-code-scanning/automatic-build-failed";
-            message =
-                "We were unable to automatically build your code. Please provide manual build steps. " +
-                    `For more information, see ${autobuildHelpLink}. ` +
-                    `Encountered the following error: ${autobuildErrors}`;
-        }
-        else {
-            let lastLine = stderr.trim().split("\n").pop()?.trim() || "";
-            if (lastLine[lastLine.length - 1] !== ".") {
-                lastLine += ".";
-            }
-            message =
-                `Encountered a fatal error while running "${prettyCommand}". ` +
-                    `Exit code was ${exitCode} and last log line was: ${lastLine} See the logs for more details.`;
-        }
-        super(message);
-        this.exitCode = exitCode;
-        this.stderr = stderr;
-        this.stdout = stdout;
-    }
-}
-exports.CommandInvocationError = CommandInvocationError;
-/**
- * Provide a better error message from the stderr of a CLI invocation that failed with a fatal
- * error.
- *
- * - If the CLI invocation failed with a fatal error, this returns that fatal error, followed by
- *   any fatal errors that occurred in plumbing commands.
- * - If the CLI invocation did not fail with a fatal error, this returns `undefined`.
- *
- * ### Example
- *
- * ```
- * Running TRAP import for CodeQL database at /home/runner/work/_temp/codeql_databases/javascript...
- * A fatal error occurred: Evaluator heap must be at least 384.00 MiB
- * A fatal error occurred: Dataset import for
- * /home/runner/work/_temp/codeql_databases/javascript/db-javascript failed with code 2
- * ```
- *
- * becomes
- *
- * ```
- * Encountered a fatal error while running "codeql-for-testing database finalize --finalize-dataset
- * --threads=2 --ram=2048 db". Exit code was 32 and error was: A fatal error occurred: Dataset
- * import for /home/runner/work/_temp/codeql_databases/javascript/db-javascript failed with code 2.
- * Context: A fatal error occurred: Evaluator heap must be at least 384.00 MiB.
- * ```
- *
- * Where possible, this tries to summarize the error into a single line, as this displays better in
- * the Actions UI.
- */
-function extractFatalErrors(error) {
-    const fatalErrorRegex = /.*fatal error occurred:/gi;
-    let fatalErrors = [];
-    let lastFatalErrorIndex;
-    let match;
-    while ((match = fatalErrorRegex.exec(error)) !== null) {
-        if (lastFatalErrorIndex !== undefined) {
-            fatalErrors.push(error.slice(lastFatalErrorIndex, match.index).trim());
-        }
-        lastFatalErrorIndex = match.index;
-    }
-    if (lastFatalErrorIndex !== undefined) {
-        const lastError = error.slice(lastFatalErrorIndex).trim();
-        if (fatalErrors.length === 0) {
-            // No other errors
-            return lastError;
-        }
-        const isOneLiner = !fatalErrors.some((e) => e.includes("\n"));
-        if (isOneLiner) {
-            fatalErrors = fatalErrors.map(ensureEndsInPeriod);
-        }
-        return [
-            ensureEndsInPeriod(lastError),
-            "Context:",
-            ...fatalErrors.reverse(),
-        ].join(isOneLiner ? " " : "\n");
-    }
-    return undefined;
-}
-function extractAutobuildErrors(error) {
-    const pattern = /.*\[autobuild\] \[ERROR\] (.*)/gi;
-    let errorLines = [...error.matchAll(pattern)].map((match) => match[1]);
-    // Truncate if there are more than 10 matching lines.
-    if (errorLines.length > 10) {
-        errorLines = errorLines.slice(0, 10);
-        errorLines.push("(truncated)");
-    }
-    return errorLines.join("\n") || undefined;
-}
-function ensureEndsInPeriod(text) {
-    return text[text.length - 1] === "." ? text : `${text}.`;
-}
-/** Error messages from the CLI that we consider configuration errors and handle specially. */
-var CliConfigErrorCategory;
-(function (CliConfigErrorCategory) {
-    CliConfigErrorCategory["GradleBuildFailed"] = "GradleBuildFailed";
-    CliConfigErrorCategory["IncompatibleWithActionVersion"] = "IncompatibleWithActionVersion";
-    CliConfigErrorCategory["InitCalledTwice"] = "InitCalledTwice";
-    CliConfigErrorCategory["InvalidSourceRoot"] = "InvalidSourceRoot";
-    CliConfigErrorCategory["MavenBuildFailed"] = "MavenBuildFailed";
-    CliConfigErrorCategory["NoBuildCommandAutodetected"] = "NoBuildCommandAutodetected";
-    CliConfigErrorCategory["NoBuildMethodAutodetected"] = "NoBuildMethodAutodetected";
-    CliConfigErrorCategory["NoSourceCodeSeen"] = "NoSourceCodeSeen";
-    CliConfigErrorCategory["NoSupportedBuildCommandSucceeded"] = "NoSupportedBuildCommandSucceeded";
-    CliConfigErrorCategory["NoSupportedBuildSystemDetected"] = "NoSupportedBuildSystemDetected";
-    CliConfigErrorCategory["SwiftBuildFailed"] = "SwiftBuildFailed";
-    CliConfigErrorCategory["UnsupportedBuildMode"] = "UnsupportedBuildMode";
-})(CliConfigErrorCategory || (exports.CliConfigErrorCategory = CliConfigErrorCategory = {}));
-/**
- * All of our caught CLI error messages that we handle specially: ie. if we
- * would like to categorize an error as a configuration error or not.
- */
-exports.cliErrorsConfig = {
-    [CliConfigErrorCategory.GradleBuildFailed]: {
-        cliErrorMessageCandidates: [
-            new RegExp("[autobuild] FAILURE: Build failed with an exception."),
-        ],
-    },
-    // Version of CodeQL CLI is incompatible with this version of the CodeQL Action
-    [CliConfigErrorCategory.IncompatibleWithActionVersion]: {
-        cliErrorMessageCandidates: [
-            new RegExp("is not compatible with this CodeQL CLI"),
-        ],
-    },
-    [CliConfigErrorCategory.InitCalledTwice]: {
-        cliErrorMessageCandidates: [
-            new RegExp("Refusing to create databases .* but could not process any of it"),
-        ],
-        additionalErrorMessageToAppend: `Is the "init" action called twice in the same job?`,
-    },
-    // Expected source location for database creation does not exist
-    [CliConfigErrorCategory.InvalidSourceRoot]: {
-        cliErrorMessageCandidates: [new RegExp("Invalid source root")],
-    },
-    [CliConfigErrorCategory.MavenBuildFailed]: {
-        cliErrorMessageCandidates: [
-            new RegExp("\\[autobuild\\] \\[ERROR\\] Failed to execute goal"),
-        ],
-    },
-    [CliConfigErrorCategory.NoBuildCommandAutodetected]: {
-        cliErrorMessageCandidates: [
-            new RegExp("Could not auto-detect a suitable build method"),
-        ],
-    },
-    [CliConfigErrorCategory.NoBuildMethodAutodetected]: {
-        cliErrorMessageCandidates: [
-            new RegExp("Could not detect a suitable build command for the source checkout"),
-        ],
-    },
-    // Usually when a manual build script has failed, or if an autodetected language
-    // was unintended to have CodeQL analysis run on it.
-    [CliConfigErrorCategory.NoSourceCodeSeen]: {
-        exitCode: 32,
-        cliErrorMessageCandidates: [
-            new RegExp("CodeQL detected code written in .* but could not process any of it"),
-            new RegExp("CodeQL did not detect any code written in languages supported by CodeQL"),
-        ],
-    },
-    [CliConfigErrorCategory.NoSupportedBuildCommandSucceeded]: {
-        cliErrorMessageCandidates: [
-            new RegExp("No supported build command succeeded"),
-        ],
-    },
-    [CliConfigErrorCategory.NoSupportedBuildSystemDetected]: {
-        cliErrorMessageCandidates: [
-            new RegExp("No supported build system detected"),
-        ],
-    },
-    [CliConfigErrorCategory.SwiftBuildFailed]: {
-        cliErrorMessageCandidates: [
-            new RegExp("\\[autobuilder/build\\] \\[build-command-failed\\] `autobuild` failed to run the build command"),
-        ],
-    },
-    [CliConfigErrorCategory.UnsupportedBuildMode]: {
-        cliErrorMessageCandidates: [
-            new RegExp("does not support the .* build mode. Please try using one of the following build modes instead"),
-        ],
-    },
-};
-/**
- * Check if the given CLI error or exit code, if applicable, apply to any known
- * CLI errors in the configuration record. If either the CLI error message matches one of
- * the error messages in the config record, or the exit codes match, return the error category;
- * if not, return undefined.
- */
-function getCliConfigCategoryIfExists(cliError) {
-    for (const [category, configuration] of Object.entries(exports.cliErrorsConfig)) {
-        if (cliError.exitCode !== undefined &&
-            configuration.exitCode !== undefined &&
-            cliError.exitCode === configuration.exitCode) {
-            return category;
-        }
-        for (const e of configuration.cliErrorMessageCandidates) {
-            if (cliError.message.match(e) || cliError.stderr.match(e)) {
-                return category;
-            }
-        }
-    }
-    return undefined;
-}
-exports.getCliConfigCategoryIfExists = getCliConfigCategoryIfExists;
-/**
- * Changes an error received from the CLI to a ConfigurationError with optionally an extra
- * error message appended, if it exists in a known set of configuration errors. Otherwise,
- * simply returns the original error.
- */
-function wrapCliConfigurationError(cliError) {
-    if (!(cliError instanceof CommandInvocationError)) {
-        return cliError;
-    }
-    const cliConfigErrorCategory = getCliConfigCategoryIfExists(cliError);
-    if (cliConfigErrorCategory === undefined) {
-        return cliError;
-    }
-    let errorMessageBuilder = cliError.message;
-    const additionalErrorMessageToAppend = exports.cliErrorsConfig[cliConfigErrorCategory].additionalErrorMessageToAppend;
-    if (additionalErrorMessageToAppend !== undefined) {
-        errorMessageBuilder = `${errorMessageBuilder} ${additionalErrorMessageToAppend}`;
-    }
-    return new util_1.ConfigurationError(errorMessageBuilder);
-}
-exports.wrapCliConfigurationError = wrapCliConfigurationError;
-//# sourceMappingURL=cli-errors.js.map