Skip to content

Commit 9e2e32f

Browse files
authored
Merge pull request #9322 from erik-krogh/fixAutoBuild
QL/RB: fix the QL-for-QL and ruby autobuilders
2 parents 6dd09c1 + 047b14e commit 9e2e32f

File tree

3 files changed

+9
-15
lines changed

3 files changed

+9
-15
lines changed

.github/workflows/ql-for-ql-build.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
uses: github/codeql-action/init@aa93aea877e5fb8841bcb1193f672abf6e9f2980
2020
with:
2121
languages: javascript # does not matter
22-
tools: latest
2322
- name: Get CodeQL version
2423
id: get-codeql-version
2524
run: |
@@ -184,7 +183,6 @@ jobs:
184183
languages: ql
185184
db-location: ${{ runner.temp }}/db
186185
config-file: ./ql-for-ql-config.yml
187-
tools: latest
188186

189187
- name: Perform CodeQL Analysis
190188
uses: github/codeql-action/analyze@aa93aea877e5fb8841bcb1193f672abf6e9f2980
@@ -224,4 +222,4 @@ jobs:
224222
uses: actions/upload-artifact@v3
225223
with:
226224
name: combined.sarif
227-
path: combined.sarif
225+
path: combined.sarif

ql/autobuilder/src/main.rs

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,29 +15,25 @@ fn main() -> std::io::Result<()> {
1515
let mut cmd = Command::new(codeql);
1616
cmd.arg("database")
1717
.arg("index-files")
18+
.arg("--include-extension=.ql")
19+
.arg("--include-extension=.qll")
20+
.arg("--include-extension=.dbscheme")
21+
.arg("--include=**/qlpack.yml")
1822
.arg("--size-limit=5m")
1923
.arg("--language=ql")
2024
.arg("--working-dir=.")
2125
.arg(db);
2226

23-
let mut has_include_dir = false; // TODO: This is a horrible hack, wait for the post-merge discussion in https://github.com/github/codeql/pull/7444 to be resolved
2427
for line in env::var("LGTM_INDEX_FILTERS")
2528
.unwrap_or_default()
2629
.split('\n')
2730
{
2831
if let Some(stripped) = line.strip_prefix("include:") {
29-
cmd.arg("--include").arg(stripped);
30-
has_include_dir = true;
32+
cmd.arg("--also-match=".to_owned() + stripped);
3133
} else if let Some(stripped) = line.strip_prefix("exclude:") {
32-
cmd.arg("--exclude").arg(stripped);
34+
cmd.arg("--exclude=".to_owned() + stripped);
3335
}
3436
}
35-
if !has_include_dir {
36-
cmd.arg("--include-extension=.ql")
37-
.arg("--include-extension=.qll")
38-
.arg("--include-extension=.dbscheme")
39-
.arg("--include=**/qlpack.yml");
40-
}
4137
let exit = &cmd.spawn()?.wait()?;
4238
std::process::exit(exit.code().unwrap_or(1))
4339
}

ruby/autobuilder/src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ fn main() -> std::io::Result<()> {
2929
.split('\n')
3030
{
3131
if let Some(stripped) = line.strip_prefix("include:") {
32-
cmd.arg("--include").arg(stripped);
32+
cmd.arg("--also-match=".to_owned() + stripped);
3333
} else if let Some(stripped) = line.strip_prefix("exclude:") {
34-
cmd.arg("--exclude").arg(stripped);
34+
cmd.arg("--exclude=".to_owned() + stripped);
3535
}
3636
}
3737
let exit = &cmd.spawn()?.wait()?;

0 commit comments

Comments
 (0)