Skip to content

Commit 4b3b1d2

Browse files
authored
Merge pull request #7222 from aibaars/ruby-ci-fix
Ruby: fix CI jobs after removal of `.codeql-manifest.json`
2 parents 3bab8c6 + 133ec2e commit 4b3b1d2

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- name: Create database
4242
run: |
4343
codeql database create \
44-
--search-path "${{ github.workspace }}/ruby" \
44+
--search-path "${{ github.workspace }}/ruby/extractor-pack" \
4545
--threads 4 \
4646
--language ruby --source-root "${{ github.workspace }}/repo" \
4747
"${{ runner.temp }}/database"

.github/workflows/ruby-qltest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ jobs:
3232
- uses: ./ruby/actions/create-extractor-pack
3333
- name: Run QL tests
3434
run: |
35-
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
35+
codeql test run --search-path "${{ github.workspace }}/ruby/extractor-pack" --check-databases --check-unused-labels --check-repeated-labels --check-redefined-labels --check-use-before-definition --consistency-queries ql/consistency-queries ql/test
3636
env:
3737
GITHUB_TOKEN: ${{ github.token }}
3838
- name: Check QL formatting
3939
run: find ql "(" -name "*.ql" -or -name "*.qll" ")" -print0 | xargs -0 codeql query format --check-only
4040
- name: Check QL compilation
4141
run: |
42-
codeql query compile --check-only --threads=4 --warnings=error --search-path "${{ github.workspace }}/ruby" --additional-packs "${{ github.workspace }}" "ql/src" "ql/examples"
42+
codeql query compile --check-only --threads=4 --warnings=error "ql/src" "ql/examples"
4343
env:
4444
GITHUB_TOKEN: ${{ github.token }}
4545
- name: Check DB upgrade scripts

ruby/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,4 @@ extractor: $(FILES) $(BIN_FILES)
6767
cp target/release/ruby-autobuilder$(EXE) extractor-pack/tools/$(CODEQL_PLATFORM)/autobuilder$(EXE)
6868

6969
test: extractor dbscheme
70-
codeql pack install ql/test
71-
codeql test run --check-databases --check-unused-labels --check-repeated-labels --check-redefined-labels --check-use-before-definition --search-path . --consistency-queries ql/consistency-queries ql/test
70+
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

ruby/doc/HOWTO.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ codeql database create <database-path> -l ruby -s <project-source-path> --search
3939
Run
4040

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

4545
## Writing database upgrade scripts

0 commit comments

Comments
 (0)