Merge branch 'main' into swift-taint-through-interpolated-strings

Author: MathiasVP

.github/actions/fetch-codeql/action.yml

@@ -7,7 +7,7 @@ runs:
       shell: bash
       run: |
         gh extension install github/gh-codeql
-        gh codeql set-channel release
+        gh codeql set-channel nightly
         gh codeql version
         gh codeql version --format=json | jq -r .unpackedLocation >> "${GITHUB_PATH}"
       env:

.github/workflows/check-qldoc.yml

@@ -5,7 +5,7 @@ on:
     paths:
       - "*/ql/lib/**"
       - .github/workflows/check-qldoc.yml
-      - .github/actions/fetch-codeql
+      - .github/actions/fetch-codeql/action.yml
     branches:
       - main
       - "rc/*"

.github/workflows/csv-coverage-metrics.yml

@@ -12,7 +12,7 @@ on:
       - main
     paths:
       - ".github/workflows/csv-coverage-metrics.yml"
-      - ".github/actions/fetch-codeql"
+      - ".github/actions/fetch-codeql/action.yml"
 
 jobs:
   publish-java:

.github/workflows/csv-coverage-pr-artifacts.yml

@@ -5,7 +5,7 @@ on:
     paths:
       - ".github/workflows/csv-coverage-pr-comment.yml"
       - ".github/workflows/csv-coverage-pr-artifacts.yml"
-      - ".github/actions/fetch-codeql"
+      - ".github/actions/fetch-codeql/action.yml"
       - "*/ql/src/**/*.ql"
       - "*/ql/src/**/*.qll"
       - "*/ql/lib/**/*.ql"
@@ -51,14 +51,14 @@ jobs:
       - name: Generate CSV files on merge commit of the PR
         run: |
           echo "Running generator on merge"
-          PATH="$PATH:codeql-cli/codeql" python merge/misc/scripts/library-coverage/generate-report.py ci merge merge
+          python merge/misc/scripts/library-coverage/generate-report.py ci merge merge
           mkdir out_merge
           cp framework-coverage-*.csv out_merge/
           cp framework-coverage-*.rst out_merge/
       - name: Generate CSV files on base commit of the PR
         run: |
           echo "Running generator on base"
-          PATH="$PATH:codeql-cli/codeql" python base/misc/scripts/library-coverage/generate-report.py ci base base
+          python base/misc/scripts/library-coverage/generate-report.py ci base base
           mkdir out_base
           cp framework-coverage-*.csv out_base/
           cp framework-coverage-*.rst out_base/

.github/workflows/csv-coverage-timeseries.yml

@@ -25,9 +25,7 @@ jobs:
         uses: ./.github/actions/fetch-codeql
       - name: Build modeled package list
         run: |
-          CLI=$(realpath "codeql-cli/codeql")
-          echo $CLI
-          PATH="$PATH:$CLI" python script/misc/scripts/library-coverage/generate-timeseries.py codeqlModels
+          python script/misc/scripts/library-coverage/generate-timeseries.py codeqlModels
       - name: Upload timeseries CSV
         uses: actions/upload-artifact@v3
         with:

.github/workflows/csv-coverage-update.yml

@@ -29,7 +29,7 @@ jobs:
         uses: ./.github/actions/fetch-codeql
       - name: Generate coverage files
         run: |
-          PATH="$PATH:codeql-cli/codeql" python ql/misc/scripts/library-coverage/generate-report.py ci ql ql
+          python ql/misc/scripts/library-coverage/generate-report.py ci ql ql
 
       - name: Create pull request with changes
         env:

.github/workflows/csv-coverage.yml

@@ -29,7 +29,7 @@ jobs:
         uses: ./.github/actions/fetch-codeql
       - name: Build modeled package list
         run: |
-          PATH="$PATH:codeql-cli/codeql" python script/misc/scripts/library-coverage/generate-report.py ci codeqlModels script
+          python script/misc/scripts/library-coverage/generate-report.py ci codeqlModels script
       - name: Upload CSV package list
         uses: actions/upload-artifact@v3
         with:

.github/workflows/go-tests.yml

@@ -4,7 +4,7 @@ on:
     paths:
       - "go/**"
       - .github/workflows/go-tests.yml
-      - .github/actions/fetch-codeql
+      - .github/actions/fetch-codeql/action.yml
       - codeql-workspace.yml
 jobs:
   test-linux:
@@ -30,12 +30,12 @@ jobs:
       - name: Build
         run: |
           cd go
-          env make
+          make
 
       - name: Check that all QL and Go code is autoformatted
         run: |
           cd go
-          env make check-formatting
+          make check-formatting
 
       - name: Compile qhelp files to markdown
         run: |
@@ -51,7 +51,7 @@ jobs:
       - name: Test
         run: |
           cd go
-          env make test
+          make test
 
   test-mac:
     name: Test MacOS

.github/workflows/js-ml-tests.yml

@@ -5,7 +5,7 @@ on:
     paths:
       - "javascript/ql/experimental/adaptivethreatmodeling/**"
       - .github/workflows/js-ml-tests.yml
-      - .github/actions/fetch-codeql
+      - .github/actions/fetch-codeql/action.yml
       - codeql-workspace.yml
     branches:
       - main
@@ -14,7 +14,7 @@ on:
     paths:
       - "javascript/ql/experimental/adaptivethreatmodeling/**"
       - .github/workflows/js-ml-tests.yml
-      - .github/actions/fetch-codeql
+      - .github/actions/fetch-codeql/action.yml
       - codeql-workspace.yml
   workflow_dispatch:
 

.github/workflows/mad_regenerate-models.yml

@@ -9,7 +9,7 @@ on:
       - main
     paths:
       - ".github/workflows/mad_regenerate-models.yml"
-      - ".github/actions/fetch-codeql"
+      - ".github/actions/fetch-codeql/action.yml"
 
 jobs:
   regenerate-models: