Skip to content

Commit

Permalink
Merge pull request #746 from github/edoardo/2.6.2-release
Browse files Browse the repository at this point in the history
Bump default CodeQL version to 2.6.2 bundle
  • Loading branch information
edoardopirovano authored Sep 21, 2021
2 parents 7112cda + 014d3ea commit 5a80cb1
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 7 deletions.
12 changes: 9 additions & 3 deletions .github/workflows/pr-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ jobs:
- name: Build code
run: |
. ./codeql-runner/codeql-env.sh
$CODEQL_RUNNER dotnet build
$CODEQL_RUNNER dotnet build /p:UseSharedCompilation=false
- name: Run analyze
run: |
Expand Down Expand Up @@ -211,7 +211,13 @@ jobs:
run: |
cat ./codeql-runner/codeql-env.sh | Invoke-Expression
$Env:CODEQL_EXTRACTOR_CSHARP_ROOT = ""
& $Env:CODEQL_RUNNER dotnet build
& $Env:CODEQL_RUNNER dotnet build /p:UseSharedCompilation=false
- name: Upload tracer logs
uses: actions/upload-artifact@v2
with:
name: tracer-logs
path: ./codeql-runner/compound-build-tracer.log

- name: Run analyze
run: |
Expand Down Expand Up @@ -249,7 +255,7 @@ jobs:
shell: bash
run: |
. ./codeql-runner/codeql-env.sh
$CODEQL_RUNNER dotnet build
$CODEQL_RUNNER dotnet build /p:UseSharedCompilation=false
- name: Run analyze
run: |
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## [UNRELEASED]

No user facing changes.
- Update default CodeQL bundle version to 2.6.2. [#746](https://github.com/github/codeql-action/pull/746)

## 1.0.14 - 09 Sep 2021

Expand Down
2 changes: 1 addition & 1 deletion lib/defaults.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"bundleVersion": "codeql-bundle-20210909"
"bundleVersion": "codeql-bundle-20210921"
}
2 changes: 1 addition & 1 deletion src/defaults.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"bundleVersion": "codeql-bundle-20210909"
"bundleVersion": "codeql-bundle-20210921"
}
2 changes: 1 addition & 1 deletion tests/multi-language-repo/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

gcc -o main main.c

dotnet build
dotnet build -p:UseSharedCompilation=false

javac Main.java

0 comments on commit 5a80cb1

Please sign in to comment.