Merge pull request github#10964 from smowton/smowton/admin/modernise-qlpacks

Dave Bartolomeo · web-flow · commit 85790fcadea6 · 2022-10-28T16:44:22.000-04:00
qlpacks: libraryPathDependencies -&gt; dependencies
diff --git a/csharp/ql/integration-tests/qlpack.yml b/csharp/ql/integration-tests/qlpack.yml
@@ -1,2 +1,2 @@
-libraryPathDependencies:
-  - codeql-csharp
+dependencies:
+  codeql/csharp-all: '*'
diff --git a/go/ql/config/legacy-support/qlpack.yml b/go/ql/config/legacy-support/qlpack.yml
@@ -1,3 +1,4 @@
 name: legacy-libraries-go
 version: 0.0.0
+# Note libraryPathDependencies is obsolete and should not be used in new qlpacks.
 libraryPathDependencies: codeql-go
diff --git a/java/ql/consistency-queries/qlpack.yml b/java/ql/consistency-queries/qlpack.yml
@@ -1,4 +1,4 @@
 name: codeql-java-consistency-queries
 version: 0.0.0
-libraryPathDependencies:
-  - codeql-java
+dependencies:
+  codeql/java-all: '*'
diff --git a/java/ql/integration-tests/linux-only/kotlin/qlpack.yml b/java/ql/integration-tests/linux-only/kotlin/qlpack.yml
@@ -1,2 +1,2 @@
-libraryPathDependencies:
-  - codeql-java
+dependencies:
+  codeql/java-all: '*'
diff --git a/java/ql/integration-tests/posix-only/kotlin/qlpack.yml b/java/ql/integration-tests/posix-only/kotlin/qlpack.yml
@@ -1,4 +1,5 @@
-libraryPathDependencies:
-  - codeql-java
-  - codeql/java-tests
-  - codeql/java-queries
+dependencies:
+  codeql/java-all: '*'
+  codeql/java-tests: '*'
+  codeql/java-queries: '*'
+
diff --git a/misc/legacy-support/cpp/qlpack.yml b/misc/legacy-support/cpp/qlpack.yml
@@ -1,4 +1,5 @@
 name: legacy-libraries-cpp
 version: 0.0.0
+# Note libraryPathDependencies is obsolete and should not be used in new qlpacks.
 libraryPathDependencies:
   - codeql/cpp-all
diff --git a/misc/legacy-support/csharp/qlpack.yml b/misc/legacy-support/csharp/qlpack.yml
@@ -1,4 +1,5 @@
 name: legacy-libraries-csharp
 version: 0.0.0
+# Note libraryPathDependencies is obsolete and should not be used in new qlpacks.
 libraryPathDependencies:
   - codeql/csharp-all
diff --git a/misc/legacy-support/java/qlpack.yml b/misc/legacy-support/java/qlpack.yml
@@ -1,4 +1,5 @@
 name: legacy-libraries-java
 version: 0.0.0
+# Note libraryPathDependencies is obsolete and should not be used in new qlpacks.
 libraryPathDependencies:
   - codeql/java-all
diff --git a/misc/legacy-support/javascript/qlpack.yml b/misc/legacy-support/javascript/qlpack.yml
@@ -1,4 +1,5 @@
 name: legacy-libraries-javascript
 version: 0.0.0
+# Note libraryPathDependencies is obsolete and should not be used in new qlpacks.
 libraryPathDependencies:
   - codeql-javascript
diff --git a/misc/legacy-support/python/qlpack.yml b/misc/legacy-support/python/qlpack.yml
@@ -1,4 +1,5 @@
 name: legacy-libraries-python
 version: 0.0.0
+# Note libraryPathDependencies is obsolete and should not be used in new qlpacks.
 libraryPathDependencies:
   - codeql/python-all
diff --git a/python/tools/recorded-call-graph-metrics/ql/qlpack.yml b/python/tools/recorded-call-graph-metrics/ql/qlpack.yml
@@ -1,4 +1,5 @@
 name: codeql-python-recorded-call-graph-metrics
 version: 0.0.1
-libraryPathDependencies: codeql-python
 extractor: python
+dependencies:
+  codeql/python-all: '*'
diff --git a/ql/ql/test/callgraph/packs/other/qlpack.yml b/ql/ql/test/callgraph/packs/other/qlpack.yml
@@ -1,3 +1,4 @@
 name: ql-other-pack-thing
 version: 0.1.0
-libraryPathDependencies: ql-testing-src-pack
+dependencies:
+  ql-testing-src-pack: '*'
diff --git a/swift/integration-tests/qlpack.yml b/swift/integration-tests/qlpack.yml
@@ -1,5 +1,5 @@
 name: integration-tests-swift
 version: 0.0.0
-libraryPathDependencies: codeql/swift-all
 extractor: swift
-
+dependencies:
+  codeql/swift-all: '*'
diff --git a/swift/integration-tests/runner.py b/swift/integration-tests/runner.py
@@ -54,7 +54,7 @@ def main(opts):
         codeql_root = this_dir.parents[1]
         cmd = [
             "codeql", "test", "run",
-            f"--search-path={codeql_root}",
+            f"--additional-packs={codeql_root}",
             "--keep-databases",
             "--dataset=db/db-swift",
             f"--threads={opts.threads}",
