Merge pull request #628 from github/aeisenberg/upgrades/work

Push upgrades pack into lib pack

.codeqlmanifest.json

@@ -4,7 +4,6 @@
     "ql/lib/qlpack.yml",
     "ql/examples/qlpack.yml",
     "ql/test/qlpack.yml",
-    "upgrades/qlpack.yml",
     "ql/config/legacy-support/qlpack.yml",
     "build/codeql-extractor-go/codeql-extractor.yml"
   ],

Makefile

@@ -125,14 +125,14 @@ test: all build/testdb/check-upgrade-path
 
 .PHONY: build/testdb/check-upgrade-path
 build/testdb/check-upgrade-path : build/testdb/go.dbscheme ql/lib/go.dbscheme
-	codeql dataset upgrade build/testdb --search-path upgrades
+	codeql dataset upgrade build/testdb --search-path ql/lib
 	diff -q build/testdb/go.dbscheme ql/lib/go.dbscheme
 
 .PHONY: build/testdb/go.dbscheme
-build/testdb/go.dbscheme: upgrades/initial/go.dbscheme
+build/testdb/go.dbscheme: ql/lib/upgrades/initial/go.dbscheme
 	rm -rf build/testdb
 	echo >build/empty.trap
-	codeql dataset import -S upgrades/initial/go.dbscheme build/testdb build/empty.trap
+	codeql dataset import -S ql/lib/upgrades/initial/go.dbscheme build/testdb build/empty.trap
 
 .PHONY: sync-dataflow-libraries
 sync-dataflow-libraries:

ql/examples/qlpack.yml

@@ -1,4 +1,4 @@
 name: codeql/go-examples
 version: 0.0.2
 dependencies:
-    codeql/go-all: ^0.0.2
+    codeql/go-all: "*"

ql/lib/qlpack.yml

@@ -4,5 +4,4 @@ groups: go
 dbscheme: go.dbscheme
 extractor: go
 library: true
-dependencies:
-    codeql/go-upgrades: ~0.0.3
+upgrades: upgrades

scripts/install-deps.sh

@@ -16,7 +16,7 @@ else
     exit 1
 fi
 
-for d in ql/lib ql/src ql/test ql/examples upgrades
+for d in ql/lib ql/src ql/test ql/examples
 do
     codeql pack install --mode ${LOCK_MODE} "${GO_ROOT}/${d}"
-done
+done

upgrades/change-notes/released/0.0.4.md

@@ -1 +0,0 @@
-## 0.0.4

upgrades/qlpack.lock.yml

@@ -1,4 +0,0 @@
----
-dependencies: {}
-compiled: false
-lockVersion: 1.0.0

upgrades/qlpack.yml

@@ -1,5 +0,0 @@
-name: codeql/go-upgrades
-version: 0.0.5-dev
-groups: go
-upgrades: .
-library: true