Skip to content

Commit b1faba9

Browse files
authored
Merge pull request github#9359 from github/henrymercer/migrate-to-codeql-workspace
Migrate `.codeqlmanifest.json` to `codeql-workspace.yml`
2 parents 1708719 + 99e6d2a commit b1faba9

File tree

9 files changed

+43
-31
lines changed

9 files changed

+43
-31
lines changed

.codeqlmanifest.json

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

.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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@ 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
1517
workflow_dispatch:
1618

1719
defaults:

.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/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/*"

.github/workflows/ruby-qltest.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-qltest.yml
8+
- codeql-workspace.yml
89
branches:
910
- main
1011
- "rc/*"
1112
pull_request:
1213
paths:
1314
- "ruby/**"
1415
- .github/workflows/ruby-qltest.yml
16+
- codeql-workspace.yml
1517
branches:
1618
- main
1719
- "rc/*"

.github/workflows/swift-qltest.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
paths:
66
- "swift/**"
77
- .github/workflows/swift-qltest.yml
8+
- codeql-workspace.yml
89
branches:
910
- main
1011
defaults:

codeql-workspace.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
provide:
2+
- "*/ql/src/qlpack.yml"
3+
- "*/ql/lib/qlpack.yml"
4+
- "*/ql/test/qlpack.yml"
5+
- "*/ql/examples/qlpack.yml"
6+
- "*/ql/consistency-queries/qlpack.yml"
7+
- "cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/qlpack.yml"
8+
- "go/ql/config/legacy-support/qlpack.yml"
9+
- "go/build/codeql-extractor-go/codeql-extractor.yml"
10+
- "javascript/ql/experimental/adaptivethreatmodeling/lib/qlpack.yml"
11+
# This pack is explicitly excluded from the workspace since most users
12+
# will want to use a version of this pack from the package cache. Internal
13+
# users can uncomment the following line and place a custom ML model
14+
# in the corresponding pack to test a custom ML model within their local
15+
# checkout.
16+
# - "javascript/ql/experimental/adaptivethreatmodeling/model/qlpack.yml"
17+
- "javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/qlpack.yml"
18+
- "javascript/ql/experimental/adaptivethreatmodeling/src/qlpack.yml"
19+
- "csharp/ql/campaigns/Solorigate/lib/qlpack.yml"
20+
- "csharp/ql/campaigns/Solorigate/src/qlpack.yml"
21+
- "csharp/ql/campaigns/Solorigate/test/qlpack.yml"
22+
- "misc/legacy-support/*/qlpack.yml"
23+
- "misc/suite-helpers/qlpack.yml"
24+
- "ruby/extractor-pack/codeql-extractor.yml"
25+
- "swift/extractor-pack/codeql-extractor.yml"
26+
- "ql/extractor-pack/codeql-extractor.ym"
27+
28+
versionPolicies:
29+
default:
30+
requireChangeNotes: true
31+
committedPrereleaseSuffix: dev
32+
committedVersion: nextPatchRelease

swift/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ bazel run //swift:create-extractor-pack
1313
which will install `swift/extractor-pack`.
1414

1515
Using `--search-path=swift/extractor-pack` will then pick up the Swift extractor. You can also use
16-
`--search-path=.`, as the extractor pack is mentioned in the root `.codeqlmanifest.json`.
16+
`--search-path=.`, as the extractor pack is mentioned in the root `codeql-workspace.yml`.
1717

1818
Notice you can run `bazel run :create-extractor-pack` if you already are in the `swift` directory.
1919

0 commit comments

Comments
 (0)