Merge upgrades qlpack into ql/src

.github/workflows/build.yml

@@ -81,7 +81,6 @@ jobs:
       - name: Build Query Pack
         run: |
           codeql/codeql pack create ql/src --output target/packs
-          codeql/codeql pack create upgrades --output target/packs
           cp -r ql/src/codeql-suites target/packs/github_codeql-ruby_*/
       - name: Compile with previous CodeQL versions
         run: |

prepare-db-upgrade.md

@@ -83,9 +83,9 @@ To create the upgrade directory manually, without using `prepare-db-upgrade.sh`:
 
 1. Get a hash of the old `.dbscheme` file, from just before your changes. You can do this by checking out the code prior to your changes and running `git hash-object ql/src/ruby.dbscheme`
 
-2. Go back to your branch and create an upgrade directory with that hash as its name, for example: `mkdir upgrades/454f1e15151422355049dc4f1f0486a03baeffef`
+2. Go back to your branch and create an upgrade directory with that hash as its name, for example: `mkdir ql/src/upgrades/454f1e15151422355049dc4f1f0486a03baeffef`
 
 3. Copy the old `.dbscheme` file to that directory, using the name old.dbscheme.
-   `cp ql/src/ruby.dbscheme upgrades/454f1e15151422355049dc4f1f0486a03baeffef/old.dbscheme`
+   `cp ql/src/ruby.dbscheme ql/src/upgrades/454f1e15151422355049dc4f1f0486a03baeffef/old.dbscheme`
  
-4. Put a copy of your new `.dbscheme` file in that directory and create an `upgrade.properties` file (as described above).
+4. Put a copy of your new `.dbscheme` file in that directory and create an `upgrade.properties` file (as described above).

prepare-db-upgrade.sh

@@ -62,7 +62,7 @@ if [ $# -gt 0 ]; then
 fi
 
 scheme_file="ql/src/ruby.dbscheme"
-upgrade_root="upgrades"
+upgrade_root="ql/src/upgrades"
 
 check_hash_valid()
 {

ql/src/qlpack.yml

@@ -3,3 +3,4 @@ version: 0.0.0
 dbscheme: ruby.dbscheme
 suites: codeql-suites
 extractor: ruby
+upgrades: upgrades

upgrades/qlpack.yml

@@ -1,2 +0,0 @@
-name: codeql-ruby-upgrades
-upgrades: .