Merge pull request #11004 from dbartol/dbartol/use-workspace-versions

Dave Bartolomeo · web-flow · commit 499f20f6e8a3 · 2022-11-02T20:02:48.000-04:00
diff --git a/cpp/ql/examples/qlpack.yml b/cpp/ql/examples/qlpack.yml
@@ -3,4 +3,4 @@ groups:
   - cpp
   - examples
 dependencies:
-  codeql/cpp-all: "*"
+  codeql/cpp-all: ${workspace}
diff --git a/cpp/ql/lib/qlpack.yml b/cpp/ql/lib/qlpack.yml
@@ -6,4 +6,4 @@ extractor: cpp
 library: true
 upgrades: upgrades
 dependencies:
-  codeql/ssa: 0.0.1
+  codeql/ssa: ${workspace}
diff --git a/cpp/ql/src/qlpack.yml b/cpp/ql/src/qlpack.yml
@@ -4,8 +4,8 @@ groups:
   - cpp
   - queries
 dependencies:
-    codeql/cpp-all: "*"
-    codeql/suite-helpers: "*"
+    codeql/cpp-all: ${workspace}
+    codeql/suite-helpers: ${workspace}
 suites: codeql-suites
 extractor: cpp
 defaultSuiteFile: codeql-suites/cpp-code-scanning.qls
diff --git a/cpp/ql/test/qlpack.yml b/cpp/ql/test/qlpack.yml
@@ -1,7 +1,7 @@
 name: codeql/cpp-tests
 groups: [cpp, test]
 dependencies:
-  codeql/cpp-all: "*"
-  codeql/cpp-queries: "*"
+  codeql/cpp-all: ${workspace}
+  codeql/cpp-queries: ${workspace}
 extractor: cpp
 tests: .
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/qlpack.yml b/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/qlpack.yml
@@ -2,7 +2,7 @@
 name: codeql/cpp-tests-cwe-190-tainted
 groups: [cpp, test]
 dependencies:
-  codeql/cpp-all: "*"
-  codeql/cpp-queries: "*"
+  codeql/cpp-all: ${workspace}
+  codeql/cpp-queries: ${workspace}
 extractor: cpp
 tests: .
diff --git a/csharp/ql/campaigns/Solorigate/lib/qlpack.yml b/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
@@ -5,4 +5,4 @@ groups:
     - solorigate
 library: true
 dependencies:
-    codeql/csharp-all: "*"
+    codeql/csharp-all: ${workspace}
diff --git a/csharp/ql/campaigns/Solorigate/src/qlpack.yml b/csharp/ql/campaigns/Solorigate/src/qlpack.yml
@@ -5,5 +5,5 @@ groups:
     - solorigate
 defaultSuiteFile: codeql-suites/solorigate.qls
 dependencies:
-    codeql/csharp-all: "*"
-    codeql/csharp-solorigate-all: "*"
+    codeql/csharp-all: ${workspace}
+    codeql/csharp-solorigate-all: ${workspace}
diff --git a/csharp/ql/campaigns/Solorigate/test/qlpack.yml b/csharp/ql/campaigns/Solorigate/test/qlpack.yml
@@ -4,9 +4,9 @@ groups:
     - solorigate
     - test
 dependencies:
-  codeql/csharp-all: "*"
-  codeql/csharp-queries: "*"
-  codeql/csharp-solorigate-all: "*"
-  codeql/csharp-solorigate-queries: "*"
+  codeql/csharp-all: ${workspace}
+  codeql/csharp-queries: ${workspace}
+  codeql/csharp-solorigate-all: ${workspace}
+  codeql/csharp-solorigate-queries: ${workspace}
 extractor: csharp
 tests: .
diff --git a/csharp/ql/consistency-queries/qlpack.yml b/csharp/ql/consistency-queries/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql-csharp-consistency-queries
 groups: [csharp, test, consistency-queries]
 dependencies:
-  codeql/csharp-all: "*"
+  codeql/csharp-all: ${workspace}
 extractor: csharp
diff --git a/csharp/ql/examples/qlpack.yml b/csharp/ql/examples/qlpack.yml
@@ -3,4 +3,4 @@ groups:
   - csharp
   - examples
 dependencies:
-  codeql/csharp-all: "*"
+  codeql/csharp-all: ${workspace}
diff --git a/csharp/ql/lib/qlpack.yml b/csharp/ql/lib/qlpack.yml
@@ -6,4 +6,4 @@ extractor: csharp
 library: true
 upgrades: upgrades
 dependencies:
-  codeql/ssa: 0.0.1 
+  codeql/ssa: ${workspace}
diff --git a/csharp/ql/src/qlpack.yml b/csharp/ql/src/qlpack.yml
@@ -7,5 +7,5 @@ suites: codeql-suites
 extractor: csharp
 defaultSuiteFile: codeql-suites/csharp-code-scanning.qls
 dependencies:
-  codeql/csharp-all: "*"
-  codeql/suite-helpers: "*"
+  codeql/csharp-all: ${workspace}
+  codeql/suite-helpers: ${workspace}
diff --git a/csharp/ql/test/qlpack.yml b/csharp/ql/test/qlpack.yml
@@ -1,7 +1,7 @@
 name: codeql-csharp-tests
 groups: [csharp, test]
 dependencies:
-  codeql/csharp-all: "*"
-  codeql/csharp-queries: "*"
+  codeql/csharp-all: ${workspace}
+  codeql/csharp-queries: ${workspace}
 extractor: csharp
 tests: .
diff --git a/go/ql/examples/qlpack.yml b/go/ql/examples/qlpack.yml
@@ -3,4 +3,4 @@ groups:
   - go
   - examples
 dependencies:
-  codeql/go-all: "*"
+  codeql/go-all: ${workspace}
diff --git a/go/ql/src/qlpack.yml b/go/ql/src/qlpack.yml
@@ -7,5 +7,5 @@ suites: codeql-suites
 extractor: go
 defaultSuiteFile: codeql-suites/go-code-scanning.qls
 dependencies:
-  codeql/go-all: "*"
-  codeql/suite-helpers: "*"
+  codeql/go-all: ${workspace}
+  codeql/suite-helpers: ${workspace}
diff --git a/go/ql/test/qlpack.yml b/go/ql/test/qlpack.yml
@@ -3,7 +3,7 @@ groups:
   - go
   - test
 dependencies:
-  codeql/go-queries: "*"
-  codeql/go-all: "*"
-  codeql/go-examples: "*"
+  codeql/go-queries: ${workspace}
+  codeql/go-all: ${workspace}
+  codeql/go-examples: ${workspace}
 extractor: go
diff --git a/java/ql/examples/qlpack.yml b/java/ql/examples/qlpack.yml
@@ -3,4 +3,4 @@ groups:
   - java
   - examples
 dependencies:
-  codeql/java-all: "*"
+  codeql/java-all: ${workspace}
diff --git a/java/ql/src/qlpack.yml b/java/ql/src/qlpack.yml
@@ -7,5 +7,5 @@ suites: codeql-suites
 extractor: java
 defaultSuiteFile: codeql-suites/java-code-scanning.qls
 dependencies:
-  codeql/java-all: "*"
-  codeql/suite-helpers: "*"
+  codeql/java-all: ${workspace}
+  codeql/suite-helpers: ${workspace}
diff --git a/java/ql/test/qlpack.yml b/java/ql/test/qlpack.yml
@@ -1,7 +1,7 @@
 name: codeql/java-tests
 groups: [java, test]
 dependencies:
-    codeql/java-all: "*"
-    codeql/java-queries: "*"
+    codeql/java-all: ${workspace}
+    codeql/java-queries: ${workspace}
 extractor: java
 tests: .
diff --git a/javascript/ql/examples/qlpack.yml b/javascript/ql/examples/qlpack.yml
@@ -3,4 +3,4 @@ groups:
   - javascript
   - examples
 dependencies:
-  codeql/javascript-all: "*"
+  codeql/javascript-all: ${workspace}
diff --git a/javascript/ql/src/qlpack.yml b/javascript/ql/src/qlpack.yml
@@ -7,6 +7,6 @@ suites: codeql-suites
 extractor: javascript
 defaultSuiteFile: codeql-suites/javascript-code-scanning.qls
 dependencies:
-  codeql/javascript-all: "*"
-  codeql/suite-helpers: "*"
-  codeql/typos: 0.0.1-dev
+  codeql/javascript-all: ${workspace}
+  codeql/suite-helpers: ${workspace}
+  codeql/typos: ${workspace}
diff --git a/javascript/ql/test/qlpack.yml b/javascript/ql/test/qlpack.yml
@@ -1,7 +1,7 @@
 name: codeql/javascript-tests
 groups: [javascript, test]
 dependencies:
-  codeql/javascript-all: "*"
-  codeql/javascript-queries: "*"
+  codeql/javascript-all: ${workspace}
+  codeql/javascript-queries: ${workspace}
 extractor: javascript
 tests: .
diff --git a/python/ql/consistency-queries/qlpack.yml b/python/ql/consistency-queries/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/python-consistency-queries
 groups: [python, test, consistency-queries]
 dependencies:
-    codeql/python-all: "*"
+    codeql/python-all: ${workspace}
 extractor: python
diff --git a/python/ql/examples/qlpack.yml b/python/ql/examples/qlpack.yml
@@ -3,4 +3,4 @@ groups:
   - python
   - examples
 dependencies:
-  codeql/python-all: "*"
+  codeql/python-all: ${workspace}
diff --git a/python/ql/src/qlpack.yml b/python/ql/src/qlpack.yml
@@ -4,8 +4,8 @@ groups:
   - python
   - queries
 dependencies:
-  codeql/python-all: "*"
-  codeql/suite-helpers: "*"
+  codeql/python-all: ${workspace}
+  codeql/suite-helpers: ${workspace}
 suites: codeql-suites
 extractor: python
 defaultSuiteFile: codeql-suites/python-code-scanning.qls
diff --git a/python/ql/test/qlpack.yml b/python/ql/test/qlpack.yml
@@ -1,7 +1,7 @@
 name: codeql/python-tests
 groups: [python, test]
 dependencies:
-    codeql/python-all: "*"
-    codeql/python-queries: "*"
+    codeql/python-all: ${workspace}
+    codeql/python-queries: ${workspace}
 extractor: python
 tests: .
diff --git a/ql/ql/consistency-queries/qlpack.yml b/ql/ql/consistency-queries/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ql-consistency-queries
 groups: [ql, test, consistency-queries]
 dependencies:
-  codeql/ql: "*"
+  codeql/ql: ${workspace}
 extractor: ql
diff --git a/ql/ql/examples/qlpack.yml b/ql/ql/examples/qlpack.yml
@@ -1,4 +1,4 @@
 name: codeql/ql-examples
 groups: [ql, examples]
 dependencies:
-    codeql/ql: "*"
+    codeql/ql: ${workspace}
diff --git a/ql/ql/src/qlpack.yml b/ql/ql/src/qlpack.yml
@@ -6,4 +6,4 @@ suites: codeql-suites
 defaultSuiteFile: codeql-suites/ql-code-scanning.qls
 extractor: ql
 dependencies:
-  codeql/typos: 0.0.4-dev
+  codeql/typos: ${workspace}
diff --git a/ql/ql/test/callgraph/packs/src/qlpack.yml b/ql/ql/test/callgraph/packs/src/qlpack.yml
@@ -1,4 +1,4 @@
 name: ql-testing-src-pack
 version: 0.1.0
 dependencies: 
-  ql-testing-lib-pack: "*"
+  ql-testing-lib-pack: ${workspace}
diff --git a/ql/ql/test/qlpack.yml b/ql/ql/test/qlpack.yml
@@ -1,7 +1,7 @@
 name: codeql/ql-tests
 groups: [ql, test]
 dependencies:
-    codeql/ql: "*"
-    codeql/ql-examples: "*"
+    codeql/ql: ${workspace}
+    codeql/ql-examples: ${workspace}
 extractor: ql
 tests: .
diff --git a/ruby/ql/consistency-queries/qlpack.yml b/ruby/ql/consistency-queries/qlpack.yml
@@ -1,4 +1,4 @@
 name: codeql/ruby-consistency-queries
 groups: [ruby, test, consistency-queries]
 dependencies:
-  codeql/ruby-all: "*"
+  codeql/ruby-all: ${workspace}
diff --git a/ruby/ql/examples/qlpack.yml b/ruby/ql/examples/qlpack.yml
@@ -3,4 +3,4 @@ groups:
   - ruby
   - examples
 dependencies:
-  codeql/ruby-all: "*"
+  codeql/ruby-all: ${workspace}
diff --git a/ruby/ql/lib/qlpack.yml b/ruby/ql/lib/qlpack.yml
@@ -6,4 +6,5 @@ dbscheme: ruby.dbscheme
 upgrades: upgrades
 library: true
 dependencies:
-  codeql/ssa: 0.0.1
+  codeql/ssa: ${workspace}
+
diff --git a/ruby/ql/src/qlpack.yml b/ruby/ql/src/qlpack.yml
@@ -6,5 +6,5 @@ groups:
 suites: codeql-suites
 defaultSuiteFile: codeql-suites/ruby-code-scanning.qls
 dependencies:
-  codeql/ruby-all: "*"
-  codeql/suite-helpers: "*"
+  codeql/ruby-all: ${workspace}
+  codeql/suite-helpers: ${workspace}
diff --git a/ruby/ql/test/qlpack.yml b/ruby/ql/test/qlpack.yml
@@ -1,8 +1,8 @@
 name: codeql/ruby-tests
 groups: [ruby, test]
 dependencies:
-  codeql/ruby-queries: "*"
-  codeql/ruby-examples: "*"
-  codeql/ruby-all: "*"
+  codeql/ruby-queries: ${workspace}
+  codeql/ruby-examples: ${workspace}
+  codeql/ruby-all: ${workspace}
 extractor: ruby
 tests: .
diff --git a/swift/ql/lib/qlpack.yml b/swift/ql/lib/qlpack.yml
@@ -6,4 +6,4 @@ dbscheme: swift.dbscheme
 upgrades: upgrades
 library: true
 dependencies:
-  codeql/ssa: 0.0.1
+  codeql/ssa: ${workspace}
diff --git a/swift/ql/src/qlpack.yml b/swift/ql/src/qlpack.yml
@@ -7,5 +7,5 @@ suites: codeql-suites
 extractor: swift
 defaultSuiteFile: codeql-suites/swift-code-scanning.qls
 dependencies:
-  codeql/swift-all: "*"
-  codeql/suite-helpers: "*"
+  codeql/swift-all: ${workspace}
+  codeql/suite-helpers: ${workspace}
diff --git a/swift/ql/test/qlpack.yml b/swift/ql/test/qlpack.yml
@@ -1,7 +1,7 @@
 name: codeql-swift-tests
 version: 0.0.0
 dependencies:
-    codeql/swift-all: "*"
-    codeql/swift-queries: "*"
+    codeql/swift-all: ${workspace}
+    codeql/swift-queries: ${workspace}
 tests: .
 extractor: swift
