Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Disable database upload in test mode
  • Loading branch information
henrymercer committed Jun 11, 2024
commit 12243c759f6b03e25f9fc38ece10cb0f862df590
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.

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: 0 additions & 2 deletions .github/workflows/__upload-ref-sha-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/__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 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.

2 changes: 0 additions & 2 deletions pr-checks/checks/all-platform-bundle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,3 @@ steps:
shell: bash
run: ./build.sh
- uses: ./../action/analyze
with:
upload-database: false
1 change: 0 additions & 1 deletion pr-checks/checks/analyze-ref-input.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,5 @@ steps:
run: ./build.sh
- uses: ./../action/analyze
with:
upload-database: false
ref: 'refs/heads/main'
sha: '5e235361806c361d4d3f8859e3c897658025a9a2'
2 changes: 0 additions & 2 deletions pr-checks/checks/autobuild-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ steps:
CORECLR_PROFILER: ""
CORECLR_PROFILER_PATH_64: ""
- uses: ./../action/analyze
with:
upload-database: false
- name: Check database
shell: bash
run: |
Expand Down
2 changes: 0 additions & 2 deletions pr-checks/checks/go-custom-queries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,3 @@ steps:
shell: bash
run: ./build.sh
- uses: ./../action/analyze
with:
upload-database: false
2 changes: 0 additions & 2 deletions pr-checks/checks/go-indirect-tracing-workaround.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ steps:
shell: bash
run: go build main.go
- uses: ./../action/analyze
with:
upload-database: false
- shell: bash
run: |
if [[ -z "${CODEQL_ACTION_GO_BINARY}" ]]; then
Expand Down
2 changes: 0 additions & 2 deletions pr-checks/checks/go-tracing-autobuilder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ steps:
tools: ${{ steps.prepare-test.outputs.tools-url }}
- uses: ./../action/autobuild
- uses: ./../action/analyze
with:
upload-database: false
- shell: bash
run: |
if [[ "${CODEQL_ACTION_DID_AUTOBUILD_GOLANG}" != true ]]; then
Expand Down
2 changes: 0 additions & 2 deletions pr-checks/checks/go-tracing-custom-build-steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ steps:
shell: bash
run: go build main.go
- uses: ./../action/analyze
with:
upload-database: false
- shell: bash
run: |
# Once we start running Bash 4.2 in all environments, we can replace the
Expand Down
2 changes: 0 additions & 2 deletions pr-checks/checks/go-tracing-legacy-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ steps:
languages: go
tools: ${{ steps.prepare-test.outputs.tools-url }}
- uses: ./../action/analyze
with:
upload-database: false
- shell: bash
run: |
cd "$RUNNER_TEMP/codeql_databases"
Expand Down
2 changes: 0 additions & 2 deletions pr-checks/checks/javascript-source-root.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ steps:
tools: ${{ steps.prepare-test.outputs.tools-url }}
- uses: ./../action/analyze
with:
upload-database: false
skip-queries: true
upload: never
- name: Assert database exists
shell: bash
run: |
Expand Down
2 changes: 0 additions & 2 deletions pr-checks/checks/test-autobuild-working-dir.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ steps:
with:
working-directory: autobuild-dir
- uses: ./../action/analyze
with:
upload-database: false
- name: Check database
shell: bash
run: |
Expand Down
2 changes: 0 additions & 2 deletions pr-checks/checks/test-local-codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,3 @@ steps:
shell: bash
run: ./build.sh
- uses: ./../action/analyze
with:
upload-database: false
2 changes: 0 additions & 2 deletions pr-checks/checks/test-proxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,3 @@ steps:
languages: javascript
tools: ${{ steps.prepare-test.outputs.tools-url }}
- uses: ./../action/analyze
with:
upload-database: false
2 changes: 0 additions & 2 deletions pr-checks/checks/upload-ref-sha-input.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,8 @@ steps:
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'
Expand Down
2 changes: 0 additions & 2 deletions pr-checks/checks/with-checkout-path.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ steps:
checkout_path: x/y/z/some-path/tests/multi-language-repo
ref: v1.1.0
sha: 474bbf07f9247ffe1856c6a0f94aeeb10e7afee6
upload: never
upload-database: false

- uses: ./../action/upload-sarif
with:
Expand Down
5 changes: 5 additions & 0 deletions src/database-upload.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ export async function uploadDatabases(
return;
}

if (util.isInTestMode()) {
logger.debug("In test mode. Skipping database upload.");
return;
}

// Do nothing when not running against github.com
if (
config.gitHubVersion.type !== util.GitHubVariant.DOTCOM &&
Expand Down