Merge branch 'main' into robertbrignull/go_build_trace

.github/workflows/codeql.yml

@@ -15,7 +15,11 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - uses: ./init
+      id: init
       with:
         languages: javascript
         config-file: ./.github/codeql/codeql-config.yml
+    # confirm steps.init.outputs.codeql-path points to the codeql binary
+    - name: Print CodeQL Version
+      run: ${{steps.init.outputs.codeql-path}} version --format=json
     - uses: ./analyze

.github/workflows/python-deps.yml

@@ -44,6 +44,7 @@ jobs:
 
     - name: Initialize CodeQL
       uses: ./init
+      id: init
       with:
         tools: latest
         languages: python
@@ -62,8 +63,7 @@ jobs:
         esac
         echo ${basePath}
 
-        codeql_version="0.0.0-$(cat "$GITHUB_WORKSPACE/src/defaults.json" | jq -r .bundleVersion | rev | cut -d - -f 1 | rev)"
-        $GITHUB_WORKSPACE/python-setup/auto_install_packages.py "${basePath}/hostedtoolcache/CodeQL/$codeql_version/x64/codeql"
+        $GITHUB_WORKSPACE/python-setup/auto_install_packages.py "$(dirname ${{steps.init.outputs.codeql-path}})"
     - name: Setup for extractor
       run: |
         echo $CODEQL_PYTHON