File tree Expand file tree Collapse file tree 3 files changed +9
-15
lines changed Expand file tree Collapse file tree 3 files changed +9
-15
lines changed Original file line number Diff line number Diff line change 19
19
uses : github/codeql-action/init@aa93aea877e5fb8841bcb1193f672abf6e9f2980
20
20
with :
21
21
languages : javascript # does not matter
22
- tools : latest
23
22
- name : Get CodeQL version
24
23
id : get-codeql-version
25
24
run : |
@@ -184,7 +183,6 @@ jobs:
184
183
languages : ql
185
184
db-location : ${{ runner.temp }}/db
186
185
config-file : ./ql-for-ql-config.yml
187
- tools : latest
188
186
189
187
- name : Perform CodeQL Analysis
190
188
uses : github/codeql-action/analyze@aa93aea877e5fb8841bcb1193f672abf6e9f2980
@@ -224,4 +222,4 @@ jobs:
224
222
uses : actions/upload-artifact@v3
225
223
with :
226
224
name : combined.sarif
227
- path : combined.sarif
225
+ path : combined.sarif
Original file line number Diff line number Diff line change @@ -15,29 +15,25 @@ fn main() -> std::io::Result<()> {
15
15
let mut cmd = Command :: new ( codeql) ;
16
16
cmd. arg ( "database" )
17
17
. arg ( "index-files" )
18
+ . arg ( "--include-extension=.ql" )
19
+ . arg ( "--include-extension=.qll" )
20
+ . arg ( "--include-extension=.dbscheme" )
21
+ . arg ( "--include=**/qlpack.yml" )
18
22
. arg ( "--size-limit=5m" )
19
23
. arg ( "--language=ql" )
20
24
. arg ( "--working-dir=." )
21
25
. arg ( db) ;
22
26
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
24
27
for line in env:: var ( "LGTM_INDEX_FILTERS" )
25
28
. unwrap_or_default ( )
26
29
. split ( '\n' )
27
30
{
28
31
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) ;
31
33
} else if let Some ( stripped) = line. strip_prefix ( "exclude:" ) {
32
- cmd. arg ( "--exclude" ) . arg ( stripped) ;
34
+ cmd. arg ( "--exclude=" . to_owned ( ) + stripped) ;
33
35
}
34
36
}
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
- }
41
37
let exit = & cmd. spawn ( ) ?. wait ( ) ?;
42
38
std:: process:: exit ( exit. code ( ) . unwrap_or ( 1 ) )
43
39
}
Original file line number Diff line number Diff line change @@ -29,9 +29,9 @@ fn main() -> std::io::Result<()> {
29
29
. split ( '\n' )
30
30
{
31
31
if let Some ( stripped) = line. strip_prefix ( "include:" ) {
32
- cmd. arg ( "--include" ) . arg ( stripped) ;
32
+ cmd. arg ( "--also-match=" . to_owned ( ) + stripped) ;
33
33
} else if let Some ( stripped) = line. strip_prefix ( "exclude:" ) {
34
- cmd. arg ( "--exclude" ) . arg ( stripped) ;
34
+ cmd. arg ( "--exclude=" . to_owned ( ) + stripped) ;
35
35
}
36
36
}
37
37
let exit = & cmd. spawn ( ) ?. wait ( ) ?;
You can’t perform that action at this time.
0 commit comments