Skip to content

Commit e009918

Browse files
authored
Merge branch 'main' into aeisenberg/externalRepoTokenConfigParsing
2 parents 272d916 + bdc7c5d commit e009918

39 files changed

+107
-51
lines changed

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

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__autobuild-action.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__ml-powered-queries.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__remote-config.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__ruby.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__split-workflow.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__swift-autobuild.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__test-proxy.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__unset-environment.yml

+5-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
# when the analyze step fails.
33
name: PR Check - Debug artifacts after failure
44
env:
5+
# Disable Kotlin analysis while it's incompatible with Kotlin 1.8, until we find a
6+
# workaround for our PR checks.
7+
CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: true
58
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
69
on:
710
push:

.github/workflows/debug-artifacts.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# Checks logs, SARIF, and database bundle debug artifacts exist.
22
name: PR Check - Debug artifact upload
33
env:
4+
# Disable Kotlin analysis while it's incompatible with Kotlin 1.8, until we find a
5+
# workaround for our PR checks.
6+
CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: true
47
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
58
on:
69
push:

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## [UNRELEASED]
44

5-
No user facing changes.
5+
- Update default CodeQL bundle version to 2.12.0. [#1466](https://github.com/github/codeql-action/pull/1466)
66

77
## 2.1.37 - 14 Dec 2022
88

lib/database-upload.js

+25-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/database-upload.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/defaults.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"bundleVersion": "codeql-bundle-20221211",
3-
"cliVersion": "2.11.6",
4-
"priorBundleVersion": "codeql-bundle-20221202",
5-
"priorCliVersion": "2.11.5"
2+
"bundleVersion": "codeql-bundle-20230105",
3+
"cliVersion": "2.12.0",
4+
"priorBundleVersion": "codeql-bundle-20221211",
5+
"priorCliVersion": "2.11.6"
66
}

pr-checks/checks/unset-environment.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ steps:
88
tools: ${{ steps.prepare-test.outputs.tools-url }}
99
- name: Build code
1010
shell: bash
11-
run: env -i PATH="$PATH" HOME="$HOME" ./build.sh
11+
# Disable Kotlin analysis while it's incompatible with Kotlin 1.8, until we find a
12+
# workaround for our PR checks.
13+
run: env -i CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN=true PATH="$PATH" HOME="$HOME" ./build.sh
1214
- uses: ./../action/analyze
1315
id: analysis
1416
- shell: bash

pr-checks/sync.py

+3
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,9 @@ def writeHeader(checkStream):
126126
'env': {
127127
'GITHUB_TOKEN': '${{ secrets.GITHUB_TOKEN }}',
128128
'GO111MODULE': 'auto',
129+
# Disable Kotlin analysis while it's incompatible with Kotlin 1.8, until we find a
130+
# workaround for our PR checks.
131+
'CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN': 'true',
129132
},
130133
'on': {
131134
'push': {

0 commit comments

Comments
 (0)