@@ -15,35 +15,35 @@ predicate runsOnDefaultBranch(Job j) {
15
15
exists ( Event e |
16
16
j .getATriggerEvent ( ) = e and
17
17
exists ( string default_branch_name |
18
- repositoryDataModel ( _, default_branch_name )
19
- ) and
20
- (
21
- e .getName ( ) = defaultBranchTriggerEvent ( ) and
22
- not e .getName ( ) = "pull_request_target"
23
- or
24
- e .getName ( ) = "push" and
25
- e .getAPropertyValue ( "branches" ) = default_branch_name
26
- or
27
- e .getName ( ) = "pull_request_target" and
18
+ repositoryDataModel ( _, default_branch_name ) and
28
19
(
29
- // no filtering
30
- not e .hasProperty ( "branches" ) and not e .hasProperty ( "branches-ignore" )
31
- or
32
- // only branches-ignore filter
33
- e .hasProperty ( "branches-ignore" ) and
34
- not e .hasProperty ( "branches" ) and
35
- not e .getAPropertyValue ( "branches-ignore" ) = default_branch_name
20
+ e .getName ( ) = defaultBranchTriggerEvent ( ) and
21
+ not e .getName ( ) = "pull_request_target"
36
22
or
37
- // only branches filter
38
- e .hasProperty ( "branches" ) and
39
- not e .hasProperty ( "branches-ignore" ) and
23
+ e .getName ( ) = "push" and
40
24
e .getAPropertyValue ( "branches" ) = default_branch_name
41
25
or
42
- // branches and branches-ignore filters
43
- e .hasProperty ( "branches" ) and
44
- e .hasProperty ( "branches-ignore" ) and
45
- e .getAPropertyValue ( "branches" ) = default_branch_name and
46
- not e .getAPropertyValue ( "branches-ignore" ) = default_branch_name
26
+ e .getName ( ) = "pull_request_target" and
27
+ (
28
+ // no filtering
29
+ not e .hasProperty ( "branches" ) and not e .hasProperty ( "branches-ignore" )
30
+ or
31
+ // only branches-ignore filter
32
+ e .hasProperty ( "branches-ignore" ) and
33
+ not e .hasProperty ( "branches" ) and
34
+ not e .getAPropertyValue ( "branches-ignore" ) = default_branch_name
35
+ or
36
+ // only branches filter
37
+ e .hasProperty ( "branches" ) and
38
+ not e .hasProperty ( "branches-ignore" ) and
39
+ e .getAPropertyValue ( "branches" ) = default_branch_name
40
+ or
41
+ // branches and branches-ignore filters
42
+ e .hasProperty ( "branches" ) and
43
+ e .hasProperty ( "branches-ignore" ) and
44
+ e .getAPropertyValue ( "branches" ) = default_branch_name and
45
+ not e .getAPropertyValue ( "branches-ignore" ) = default_branch_name
46
+ )
47
47
)
48
48
)
49
49
)
0 commit comments