Merge pull request #362 from github/merge-3.3-main

Merge 3.3 into main

Author: aibaars

.devcontainer/Dockerfile

@@ -9,5 +9,6 @@ runs:
         LATEST=$(gh release list --repo https://github.com/github/codeql-cli-binaries | cut -f 1 | grep -v beta | sort --version-sort | tail -1)
         gh release download --repo https://github.com/github/codeql-cli-binaries --pattern codeql-linux64.zip "$LATEST"
         unzip -q codeql-linux64.zip
+        echo "${{ github.workspace }}/codeql" >> $GITHUB_PATH
       env:
         GITHUB_TOKEN: ${{ github.token }}

.devcontainer/devcontainer.json

@@ -1,18 +1,18 @@
 version: 2
 updates:
   - package-ecosystem: "cargo"
-    directory: "/node-types"
+    directory: "ruby/node-types"
     schedule:
       interval: "daily"
   - package-ecosystem: "cargo"
-    directory: "/generator"
+    directory: "ruby/generator"
     schedule:
       interval: "daily"
   - package-ecosystem: "cargo"
-    directory: "/extractor"
+    directory: "ruby/extractor"
     schedule:
       interval: "daily"
   - package-ecosystem: "cargo"
-    directory: "/autobuilder"
+    directory: "ruby/autobuilder"
     schedule:
       interval: "daily"

.devcontainer/post_attach.sh

@@ -6,7 +6,7 @@ on:
       - main
       - 'rc/*'
     paths:
-      - "**/*.qhelp"
+      - "ruby/**/*.qhelp"
 
 jobs:
   qhelp:
@@ -32,7 +32,7 @@ jobs:
           for path in ${{ steps.changes.outputs.qhelp_files }} ; do
             echo "<details> <summary>${path}</summary>"
             echo
-            codeql/codeql generate query-help --format=markdown ${path}
+            codeql generate query-help --format=markdown ${path}
             echo "</details>"
           done) | gh pr comment "${{ github.event.pull_request.number }}" -F -
         env:

.devcontainer/post_create.sh

@@ -1,11 +1,15 @@
-name: Build / Release
+name: "Ruby: Build"
 
 on:
   push:
+    paths:
+      - 'ruby/**'
     branches:
       - main
       - 'rc/*'
   pull_request:
+    paths:
+      - 'ruby/**'
     branches:
       - main
       - 'rc/*'
@@ -18,6 +22,10 @@ on:
 env:
   CARGO_TERM_COLOR: always
 
+defaults:
+  run:
+    working-directory: ruby
+
 jobs:
   build:
     strategy:
@@ -39,7 +47,7 @@ jobs:
           path: |
             ~/.cargo/registry
             ~/.cargo/git
-            target
+            ruby/target
           key: ${{ runner.os }}-rust-cargo-${{ hashFiles('**/Cargo.lock') }}
       - name: Check formatting
         run: cargo fmt --all -- --check
@@ -56,20 +64,20 @@ jobs:
         if: ${{ matrix.os == 'ubuntu-latest' }}
         with:
           name: ruby.dbscheme
-          path: ql/lib/ruby.dbscheme
+          path: ruby/ql/lib/ruby.dbscheme
       - uses: actions/upload-artifact@v2
         if: ${{ matrix.os == 'ubuntu-latest' }}
         with:
           name: TreeSitter.qll
-          path: ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
+          path: ruby/ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
       - uses: actions/upload-artifact@v2
         with:
           name: extractor-${{ matrix.os }}
           path: |
-            target/release/ruby-autobuilder
-            target/release/ruby-autobuilder.exe
-            target/release/ruby-extractor
-            target/release/ruby-extractor.exe
+            ruby/target/release/ruby-autobuilder
+            ruby/target/release/ruby-autobuilder.exe
+            ruby/target/release/ruby-extractor
+            ruby/target/release/ruby-extractor.exe
           retention-days: 1
   compile-queries:
     runs-on: ubuntu-latest
@@ -106,7 +114,7 @@ jobs:
         with:
           name: codeql-ruby-queries
           path: |
-            target/packs/*
+            ruby/target/packs/*
           retention-days: 1
 
   package:
@@ -117,19 +125,19 @@ jobs:
       - uses: actions/download-artifact@v2
         with:
           name: ruby.dbscheme
-          path: ruby
+          path: ruby/ruby
       - uses: actions/download-artifact@v2
         with:
           name: extractor-ubuntu-latest
-          path: linux64
+          path: ruby/linux64
       - uses: actions/download-artifact@v2
         with:
           name: extractor-windows-latest
-          path: win64
+          path: ruby/win64
       - uses: actions/download-artifact@v2
         with:
           name: extractor-macos-latest
-          path: osx64
+          path: ruby/osx64
       - run: |
           mkdir -p ruby
           cp -r codeql-extractor.yml tools ql/lib/ruby.dbscheme.stats ruby/
@@ -145,12 +153,12 @@ jobs:
       - uses: actions/upload-artifact@v2
         with:
           name: codeql-ruby-pack
-          path: codeql-ruby.zip
+          path: ruby/codeql-ruby.zip
           retention-days: 1
       - uses: actions/download-artifact@v2
         with:
           name: codeql-ruby-queries
-          path: qlpacks
+          path: ruby/qlpacks
       - run: |
           echo '{
             "provide": [
@@ -162,18 +170,13 @@ jobs:
       - uses: actions/upload-artifact@v2
         with:
           name: codeql-ruby-bundle
-          path: codeql-ruby-bundle.zip
+          path: ruby/codeql-ruby-bundle.zip
           retention-days: 1
-      - if: ${{ github.event.inputs.tag }}
-        run: |
-          gh release create --prerelease \
-             --title "CodeQL Ruby (${{ github.event.inputs.tag }})" \
-             --target "${{ github.sha }}" \
-             "${{ github.event.inputs.tag }}" \
-             codeql-ruby-bundle.zip
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
   test:
+    defaults:
+      run:
+        working-directory: ${{ github.workspace }}
     strategy:
       fail-fast: false
       matrix:

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

@@ -1,18 +1,18 @@
-name: Collect database stats
+name: "Ruby: Collect database stats"
 
 on:
   push:
     branches:
       - main
       - 'rc/*'
     paths:
-      - ql/lib/ruby.dbscheme
+      - ruby/ql/lib/ruby.dbscheme
   pull_request:
     branches:
       - main
       - 'rc/*'
     paths:
-      - ql/lib/ruby.dbscheme
+      - ruby/ql/lib/ruby.dbscheme
   workflow_dispatch:
 
 jobs:
@@ -29,7 +29,7 @@ jobs:
 
       - uses: ./.github/actions/fetch-codeql
 
-      - uses: ./.github/actions/create-extractor-pack
+      - uses: ./ruby/actions/create-extractor-pack
 
       - name: Checkout ${{ matrix.repo }}
         uses: actions/checkout@v2
@@ -38,15 +38,15 @@ jobs:
           path: ${{ github.workspace }}/repo
       - name: Create database
         run: |
-          codeql/codeql database create \
-            --search-path "${{ github.workspace }}" \
+          codeql database create \
+            --search-path "${{ github.workspace }}/ruby" \
             --threads 4 \
             --language ruby --source-root "${{ github.workspace }}/repo" \
             "${{ runner.temp }}/database"
       - name: Measure database
         run: |
           mkdir -p "stats/${{ matrix.repo }}"
-          codeql/codeql dataset measure --threads 4 --output "stats/${{ matrix.repo }}/stats.xml" "${{ runner.temp }}/database/db-ruby"
+          codeql dataset measure --threads 4 --output "stats/${{ matrix.repo }}/stats.xml" "${{ runner.temp }}/database/db-ruby"
       - uses: actions/upload-artifact@v2
         with:
           name: measurements
@@ -64,8 +64,8 @@ jobs:
           path: stats
       - run: |
           python -m pip install --user lxml
-          find stats -name 'stats.xml' | sort | xargs python scripts/merge_stats.py --output ql/lib/ruby.dbscheme.stats --normalise ruby_tokeninfo
+          find stats -name 'stats.xml' | sort | xargs python ruby/scripts/merge_stats.py --output ruby/ql/lib/ruby.dbscheme.stats --normalise ruby_tokeninfo
       - uses: actions/upload-artifact@v2
         with:
           name: ruby.dbscheme.stats
-          path: ql/lib/ruby.dbscheme.stats
+          path: ruby/ql/lib/ruby.dbscheme.stats