Skip to content

Commit bb0435a

Browse files
committed
Merge branch 'main' into ruby-mad-argument-self
2 parents f7e58a9 + 4a02505 commit bb0435a

File tree

758 files changed

+63495
-8661
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

758 files changed

+63495
-8661
lines changed

.codeqlmanifest.json

Lines changed: 0 additions & 30 deletions
This file was deleted.

.github/labeler.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,31 @@
66
- csharp/**/*
77
- change-notes/**/*csharp*
88

9+
Go:
10+
- go/**/*
11+
- change-notes/**/*go.*
12+
913
Java:
10-
- java/**/*
14+
- any: [ 'java/**/*', '!java/kotlin-extractor/**/*', '!java/kotlin-explorer/**/*', '!java/ql/test/kotlin/**/*' ]
1115
- change-notes/**/*java.*
1216

1317
JS:
1418
- any: [ 'javascript/**/*', '!javascript/ql/experimental/adaptivethreatmodeling/**/*' ]
1519
- change-notes/**/*javascript*
1620

21+
Kotlin:
22+
- java/kotlin-extractor/**/*
23+
- java/kotlin-explorer/**/*
24+
- java/ql/test/kotlin/**/*
25+
1726
Python:
1827
- python/**/*
1928
- change-notes/**/*python*
2029

2130
Ruby:
2231
- ruby/**/*
2332
- change-notes/**/*ruby*
24-
33+
2534
Swift:
2635
- swift/**/*
2736
- change-notes/**/*swift*
@@ -31,5 +40,5 @@ documentation:
3140
- "**/*.md"
3241
- docs/**/*
3342

34-
"QL-for-QL":
43+
"QL-for-QL":
3544
- ql/**/*

.github/workflows/go-tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
paths:
55
- "go/**"
66
- .github/workflows/go-tests.yml
7+
- codeql-workspace.yml
78
jobs:
89

910
test-linux:

.github/workflows/js-ml-tests.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,16 @@ on:
55
paths:
66
- "javascript/ql/experimental/adaptivethreatmodeling/**"
77
- .github/workflows/js-ml-tests.yml
8+
- codeql-workspace.yml
89
branches:
910
- main
1011
- "rc/*"
1112
pull_request:
1213
paths:
1314
- "javascript/ql/experimental/adaptivethreatmodeling/**"
1415
- .github/workflows/js-ml-tests.yml
16+
- codeql-workspace.yml
17+
workflow_dispatch:
1518

1619
defaults:
1720
run:

.github/workflows/labeler.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44

55
jobs:
66
triage:
7+
permissions:
8+
contents: read
9+
pull-requests: write
710
runs-on: ubuntu-latest
811
steps:
912
- uses: actions/labeler@v4

.github/workflows/mad_modelDiff.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
DATABASE=$2
6262
cd codeql-$QL_VARIANT
6363
SHORTNAME=`basename $DATABASE`
64-
python java/ql/src/utils/model-generator/GenerateFlowModel.py $DATABASE $MODELS/${SHORTNAME}.qll
64+
python java/ql/src/utils/model-generator/GenerateFlowModel.py --with-summaries --with-sinks $DATABASE $MODELS/${SHORTNAME}.qll
6565
mv $MODELS/${SHORTNAME}.qll $MODELS/${SHORTNAME}Generated_${QL_VARIANT}.qll
6666
cd ..
6767
}

.github/workflows/mad_regenerate-models.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
ref: ["placeholder"]
2121
include:
2222
- slug: "apache/commons-io"
23-
ref: "8985de8fe74f6622a419b37a6eed0dbc484dc128"
23+
ref: "13258ce2d07aa0e764bbaa8020af4dcd3a02a620"
2424
exclude:
2525
- slug: "placeholder"
2626
ref: "placeholder"

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ on:
55
branches: [main]
66
paths:
77
- "ql/**"
8+
- codeql-workspace.yml
89
pull_request:
910
branches: [main]
1011
paths:
1112
- "ql/**"
13+
- codeql-workspace.yml
1214

1315
env:
1416
CARGO_TERM_COLOR: always

.github/workflows/query-list.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ on:
55
branches:
66
- main
77
- 'rc/**'
8+
tags:
9+
- 'codeql-cli/*'
810
pull_request:
911
paths:
1012
- '.github/workflows/query-list.yml'

.github/workflows/ruby-build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@ on:
55
paths:
66
- "ruby/**"
77
- .github/workflows/ruby-build.yml
8+
- codeql-workspace.yml
89
branches:
910
- main
1011
- "rc/*"
1112
pull_request:
1213
paths:
1314
- "ruby/**"
1415
- .github/workflows/ruby-build.yml
16+
- codeql-workspace.yml
1517
branches:
1618
- main
1719
- "rc/*"

0 commit comments

Comments
 (0)