Merge pull request #2328 from github/henrymercer/direct-tracing-fix

Fix incompatibility between direct tracing in the `autobuild` Action and specifying a custom working directory

pr-checks/checks/all-platform-bundle.yml

@@ -15,5 +15,3 @@ steps:
     shell: bash
     run: ./build.sh
   - uses: ./../action/analyze
-    with:
-      upload-database: false

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'

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: |

pr-checks/checks/autobuild-direct-tracing-with-working-dir.yml

@@ -0,0 +1,34 @@
+name: "Autobuild direct tracing (custom working directory)"
+description: >
+  An end-to-end integration test of a Java repository built using 'build-mode: autobuild',
+  with direct tracing enabled and a custom working directory specified as the input to the
+  autobuild Action.
+operatingSystems: ["ubuntu", "windows"]
+versions: ["linked", "nightly-latest"]
+env:
+  CODEQL_ACTION_AUTOBUILD_BUILD_MODE_DIRECT_TRACING: true
+steps:
+  - name: Test setup
+    shell: bash
+    run: |
+      # Make sure that Gradle build succeeds in autobuild-dir ...
+      cp -a ../action/tests/java-repo autobuild-dir
+      # ... and fails if attempted in the current directory
+      echo > build.gradle
+  - uses: ./../action/init
+    with:
+      build-mode: autobuild
+      languages: java
+      tools: ${{ steps.prepare-test.outputs.tools-url }}
+  - name: Check that indirect tracing is disabled
+    shell: bash
+    run: |
+      if [[ ! -z "${CODEQL_RUNNER}" ]]; then
+        echo "Expected indirect tracing to be disabled, but the" \
+          "CODEQL_RUNNER environment variable is set."
+        exit 1
+      fi
+  - uses: ./../action/autobuild
+    with:
+      working-directory: autobuild-dir
+  - uses: ./../action/analyze

pr-checks/checks/go-custom-queries.yml

@@ -15,5 +15,3 @@ steps:
     shell: bash
     run: ./build.sh
   - uses: ./../action/analyze
-    with:
-      upload-database: false

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

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

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

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"

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: |

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: |

pr-checks/checks/test-local-codeql.yml

@@ -20,5 +20,3 @@ steps:
     shell: bash
     run: ./build.sh
   - uses: ./../action/analyze
-    with:
-      upload-database: false

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

pr-checks/checks/upload-ref-sha-input.yml

@@ -10,9 +10,9 @@ steps:
   - name: Build code
     shell: bash
     run: ./build.sh
+  # Generate some SARIF we can upload with the upload-sarif step
   - uses: ./../action/analyze
     with:
-      upload-database: false
       ref: 'refs/heads/main'
       sha: '5e235361806c361d4d3f8859e3c897658025a9a2'
       upload: never

pr-checks/checks/with-checkout-path.yml

@@ -35,14 +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:
-      ref: v1.1.0
-      sha: 474bbf07f9247ffe1856c6a0f94aeeb10e7afee6
-      checkout_path: x/y/z/some-path/tests/multi-language-repo
 
   - name: Verify SARIF after upload
     shell: bash