Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge releases/v3 into releases/v2 #2339

Merged
merged 27 commits into from
Jun 13, 2024
Merged
Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
e8100b1
Update default bundle to codeql-bundle-v2.17.5
github-actions[bot] Jun 11, 2024
28d4d51
Add changelog note
github-actions[bot] Jun 11, 2024
8d778e7
Merge branch 'main' into update-bundle/codeql-bundle-v2.17.5
henrymercer Jun 11, 2024
599f279
Bump the feature flag version for direct tracing autobuild
henrymercer Jun 11, 2024
6d62742
Pass `working-directory` input to `trace-command` invocation
henrymercer Jun 11, 2024
b004bb4
Add PR check for direct tracing with custom working directory
henrymercer Jun 11, 2024
0c392c4
Add rollback mechanism for C# buildless
henrymercer Jun 11, 2024
12243c7
Disable database upload in test mode
henrymercer Jun 11, 2024
485d096
Update upload-sarif ref/sha input test
henrymercer Jun 11, 2024
ba4e487
Update `checkout_path` test
henrymercer Jun 11, 2024
94acfdc
Upload SARIF with ref/sha inputs: Generate SARIF with analyze Action
henrymercer Jun 11, 2024
f2ea211
Merge branch 'main' into henrymercer/direct-tracing-fix
henrymercer Jun 12, 2024
385808c
Update changelog and version after v3.25.9
github-actions[bot] Jun 12, 2024
356bee4
Update checked-in dependencies
github-actions[bot] Jun 12, 2024
1fc6e20
Merge pull request #2335 from github/mergeback/v3.25.9-to-main-530d4fea
henrymercer Jun 12, 2024
b3642aa
Merge branch 'main' into update-bundle/codeql-bundle-v2.17.5
smowton Jun 12, 2024
c36b5fc
Merge pull request #2327 from github/update-bundle/codeql-bundle-v2.17.5
smowton Jun 12, 2024
789b5f8
Merge pull request #2328 from github/henrymercer/direct-tracing-fix
henrymercer Jun 13, 2024
feec81c
Merge branch 'main' into henrymercer/csharp-buildless-rollback-mechanism
henrymercer Jun 13, 2024
5bf6dad
Merge pull request #2329 from github/henrymercer/csharp-buildless-rol…
henrymercer Jun 13, 2024
9b72dbd
Update changelog for v3.25.10
github-actions[bot] Jun 13, 2024
23acc5c
Merge pull request #2337 from github/update-v3.25.10-5bf6dad35
smowton Jun 13, 2024
3998c92
Revert "Update version and changelog for v2.25.9"
github-actions[bot] Jun 13, 2024
46c2e16
Revert "Update checked-in dependencies"
github-actions[bot] Jun 13, 2024
a78cac1
Merge remote-tracking branch 'origin/releases/v3' into backport-v2.25…
github-actions[bot] Jun 13, 2024
d6233df
Update version and changelog for v2.25.10
github-actions[bot] Jun 13, 2024
691ac2e
Update checked-in dependencies
github-actions[bot] Jun 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/actions/query-filter-test/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ runs:
- uses: ./../action/analyze
with:
output: ${{ runner.temp }}/results
upload-database: false
upload: never
env:
CODEQL_ACTION_TEST_MODE: "true"
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/__all-platform-bundle.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion .github/workflows/__analyze-ref-input.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions .github/workflows/__autobuild-action.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions .github/workflows/__go-custom-queries.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions .github/workflows/__go-indirect-tracing-workaround.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions .github/workflows/__go-tracing-autobuilder.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions .github/workflows/__go-tracing-custom-build-steps.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions .github/workflows/__go-tracing-legacy-workflow.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions .github/workflows/__javascript-source-root.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions .github/workflows/__test-autobuild-working-dir.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions .github/workflows/__test-local-codeql.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions .github/workflows/__test-proxy.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/__upload-ref-sha-input.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions .github/workflows/__with-checkout-path.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions .github/workflows/expected-queries-runs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ jobs:
- uses: ./../action/analyze
with:
output: ${{ runner.temp }}/results
upload-database: false
upload: never

- name: Check Sarif
uses: ./../action/.github/actions/check-sarif
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/python312-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ on:

jobs:
test-setup-python-scripts:
env:
CODEQL_ACTION_TEST_MODE: true
timeout-minutes: 45
runs-on: windows-latest

Expand All @@ -37,6 +39,3 @@ jobs:

- name: Analyze
uses: ./../action/analyze
with:
upload: false
upload-database: false
2 changes: 0 additions & 2 deletions .github/workflows/test-codeql-bundle-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,5 @@ jobs:
shell: bash
run: ./build.sh
- uses: ./../action/analyze
with:
upload-database: false
env:
CODEQL_ACTION_TEST_MODE: true
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th

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

## 2.25.10 - 13 Jun 2024

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

## 2.25.9 - 12 Jun 2024

- Avoid failing database creation if the database folder already exists and contains some unexpected files. Requires CodeQL 2.18.0 or higher. [#2330](https://github.com/github/codeql-action/pull/2330)
Expand Down
2 changes: 2 additions & 0 deletions lib/codeql.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/codeql.js.map

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions lib/config-utils.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/config-utils.js.map

Large diffs are not rendered by default.

59 changes: 36 additions & 23 deletions lib/config-utils.test.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/config-utils.test.js.map

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions lib/database-upload.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/database-upload.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions lib/defaults.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"bundleVersion": "codeql-bundle-v2.17.4",
"cliVersion": "2.17.4",
"priorBundleVersion": "codeql-bundle-v2.17.3",
"priorCliVersion": "2.17.3"
"bundleVersion": "codeql-bundle-v2.17.5",
"cliVersion": "2.17.5",
"priorBundleVersion": "codeql-bundle-v2.17.4",
"priorCliVersion": "2.17.4"
}
Loading
Loading