Disable database upload in test mode

github · Jun 11, 2024 · 12243c7 · 12243c7
1 parent b004bb4
commit 12243c7
Show file tree

Hide file tree

Showing 35 changed files with 12 additions and 63 deletions.
diff --git a/.github/actions/query-filter-test/action.yml b/.github/actions/query-filter-test/action.yml
@@ -48,7 +48,6 @@ runs:
     - uses: ./../action/analyze
       with:
         output: ${{ runner.temp }}/results
-        upload-database: false
         upload: never
       env:
         CODEQL_ACTION_TEST_MODE: "true"

diff --git a/.github/workflows/__all-platform-bundle.yml b/.github/workflows/__all-platform-bundle.yml
diff --git a/.github/workflows/__analyze-ref-input.yml b/.github/workflows/__analyze-ref-input.yml
diff --git a/.github/workflows/__autobuild-action.yml b/.github/workflows/__autobuild-action.yml
diff --git a/.github/workflows/__go-custom-queries.yml b/.github/workflows/__go-custom-queries.yml
diff --git a/.github/workflows/__go-indirect-tracing-workaround.yml b/.github/workflows/__go-indirect-tracing-workaround.yml
diff --git a/.github/workflows/__go-tracing-autobuilder.yml b/.github/workflows/__go-tracing-autobuilder.yml
diff --git a/.github/workflows/__go-tracing-custom-build-steps.yml b/.github/workflows/__go-tracing-custom-build-steps.yml
diff --git a/.github/workflows/__go-tracing-legacy-workflow.yml b/.github/workflows/__go-tracing-legacy-workflow.yml
diff --git a/.github/workflows/__javascript-source-root.yml b/.github/workflows/__javascript-source-root.yml
diff --git a/.github/workflows/__test-autobuild-working-dir.yml b/.github/workflows/__test-autobuild-working-dir.yml
diff --git a/.github/workflows/__test-local-codeql.yml b/.github/workflows/__test-local-codeql.yml
diff --git a/.github/workflows/__test-proxy.yml b/.github/workflows/__test-proxy.yml
diff --git a/.github/workflows/__upload-ref-sha-input.yml b/.github/workflows/__upload-ref-sha-input.yml
diff --git a/.github/workflows/__with-checkout-path.yml b/.github/workflows/__with-checkout-path.yml
diff --git a/.github/workflows/expected-queries-runs.yml b/.github/workflows/expected-queries-runs.yml
@@ -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

diff --git a/.github/workflows/python312-windows.yml b/.github/workflows/python312-windows.yml
@@ -14,6 +14,8 @@ on:
 
 jobs:
   test-setup-python-scripts:
+    env:
+      CODEQL_ACTION_TEST_MODE: true
     timeout-minutes: 45
     runs-on: windows-latest
 
@@ -37,6 +39,3 @@ jobs:
 
     - name: Analyze
       uses: ./../action/analyze
-      with:
-        upload: false
-        upload-database: false
diff --git a/.github/workflows/test-codeql-bundle-all.yml b/.github/workflows/test-codeql-bundle-all.yml
@@ -53,7 +53,5 @@ jobs:
       shell: bash
       run: ./build.sh
     - uses: ./../action/analyze
-      with:
-        upload-database: false
     env:
       CODEQL_ACTION_TEST_MODE: true
diff --git a/lib/database-upload.js b/lib/database-upload.js
diff --git a/lib/database-upload.js.map b/lib/database-upload.js.map
diff --git a/pr-checks/checks/all-platform-bundle.yml b/pr-checks/checks/all-platform-bundle.yml
@@ -15,5 +15,3 @@ steps:
     shell: bash
     run: ./build.sh
   - uses: ./../action/analyze
-    with:
-      upload-database: false
diff --git a/pr-checks/checks/analyze-ref-input.yml b/pr-checks/checks/analyze-ref-input.yml
@@ -12,6 +12,5 @@ steps:
     run: ./build.sh
   - uses: ./../action/analyze
     with:
-      upload-database: false
       ref: 'refs/heads/main'
       sha: '5e235361806c361d4d3f8859e3c897658025a9a2'
diff --git a/pr-checks/checks/autobuild-action.yml b/pr-checks/checks/autobuild-action.yml
@@ -16,8 +16,6 @@ steps:
       CORECLR_PROFILER: ""
       CORECLR_PROFILER_PATH_64: ""
   - uses: ./../action/analyze
-    with:
-      upload-database: false
   - name: Check database
     shell: bash
     run: |

diff --git a/pr-checks/checks/go-custom-queries.yml b/pr-checks/checks/go-custom-queries.yml
@@ -15,5 +15,3 @@ steps:
     shell: bash
     run: ./build.sh
   - uses: ./../action/analyze
-    with:
-      upload-database: false
diff --git a/pr-checks/checks/go-indirect-tracing-workaround.yml b/pr-checks/checks/go-indirect-tracing-workaround.yml
@@ -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

diff --git a/pr-checks/checks/go-tracing-autobuilder.yml b/pr-checks/checks/go-tracing-autobuilder.yml
@@ -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

diff --git a/pr-checks/checks/go-tracing-custom-build-steps.yml b/pr-checks/checks/go-tracing-custom-build-steps.yml
@@ -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

diff --git a/pr-checks/checks/go-tracing-legacy-workflow.yml b/pr-checks/checks/go-tracing-legacy-workflow.yml
@@ -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"

diff --git a/pr-checks/checks/javascript-source-root.yml b/pr-checks/checks/javascript-source-root.yml
@@ -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: |

diff --git a/pr-checks/checks/test-autobuild-working-dir.yml b/pr-checks/checks/test-autobuild-working-dir.yml
@@ -18,8 +18,6 @@ steps:
     with:
       working-directory: autobuild-dir
   - uses: ./../action/analyze
-    with:
-      upload-database: false
   - name: Check database
     shell: bash
     run: |

diff --git a/pr-checks/checks/test-local-codeql.yml b/pr-checks/checks/test-local-codeql.yml
@@ -20,5 +20,3 @@ steps:
     shell: bash
     run: ./build.sh
   - uses: ./../action/analyze
-    with:
-      upload-database: false
diff --git a/pr-checks/checks/test-proxy.yml b/pr-checks/checks/test-proxy.yml
@@ -18,5 +18,3 @@ steps:
       languages: javascript
       tools: ${{ steps.prepare-test.outputs.tools-url }}
   - uses: ./../action/analyze
-    with:
-      upload-database: false
diff --git a/pr-checks/checks/upload-ref-sha-input.yml b/pr-checks/checks/upload-ref-sha-input.yml
@@ -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'

diff --git a/pr-checks/checks/with-checkout-path.yml b/pr-checks/checks/with-checkout-path.yml
@@ -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:

diff --git a/src/database-upload.ts b/src/database-upload.ts
@@ -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 &&