Skip to content

Commit 5c77b87

Browse files
committed
Ruby: Unified handling of in-tree extractor packs.
1 parent 7b72018 commit 5c77b87

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

.github/workflows/ruby-dataset-measure.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ jobs:
4444
- name: Create database
4545
run: |
4646
codeql database create \
47-
--search-path "${{ github.workspace }}/ruby/extractor-pack" \
4847
--threads 4 \
4948
--language ruby --source-root "${{ github.workspace }}/repo" \
5049
"${{ runner.temp }}/database"

.github/workflows/ruby-qltest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ jobs:
6464
- name: Cache compilation cache
6565
id: query-cache
6666
uses: ./.github/actions/cache-query-compilation
67-
with:
67+
with:
6868
key: ruby-qltest
6969
- name: Run QL tests
7070
run: |
71-
codeql test run --threads=0 --ram 50000 --search-path "${{ github.workspace }}/ruby/extractor-pack" --check-databases --check-undefined-labels --check-unused-labels --check-repeated-labels --check-redefined-labels --check-use-before-definition --consistency-queries ql/consistency-queries ql/test --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}"
71+
codeql test run --threads=0 --ram 50000 --check-databases --check-undefined-labels --check-unused-labels --check-repeated-labels --check-redefined-labels --check-use-before-definition --consistency-queries ql/consistency-queries ql/test --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}"
7272
env:
7373
GITHUB_TOKEN: ${{ github.token }}

ruby/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,4 @@ extractor: $(FILES) $(BIN_FILES)
6565
cp extractor/target/release/codeql-extractor-ruby$(EXE) extractor-pack/tools/$(CODEQL_PLATFORM)/extractor$(EXE)
6666

6767
test: extractor dbscheme
68-
codeql test run --check-databases --check-unused-labels --check-repeated-labels --check-redefined-labels --check-use-before-definition --search-path extractor-pack --consistency-queries ql/consistency-queries ql/test
68+
codeql test run --check-databases --check-unused-labels --check-repeated-labels --check-redefined-labels --check-use-before-definition --consistency-queries ql/consistency-queries ql/test

ruby/doc/HOWTO.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ First, get an extractor pack. There are two options:
3131
Then run
3232

3333
```bash
34-
codeql database create <database-path> -l ruby -s <project-source-path> --search-path <extractor-pack-path>
34+
codeql database create <database-path> -l ruby -s <project-source-path>
3535
```
3636

3737
## Running qltests
3838

3939
Run
4040

4141
```bash
42-
codeql test run <test-path> --search-path <extractor-pack-path>
42+
codeql test run <test-path>
4343
```
4444

4545
## Writing database upgrade scripts

0 commit comments

Comments
 (0)