Merge branch 'master' into wait-for-jobs-to-finish

lerna.json

@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "3.10.7",
+  "version": "3.11.0",
   "npmClient": "yarn",
   "concurrency": 20,
   "command": {

packages/server/src/api/routes/tests/queries/generic-sql.spec.ts

@@ -664,7 +664,7 @@ if (descriptions.length) {
               parameters: { number: 0 },
             })
 
-            const rows = await client(tableName).select("*")
+            const rows = await client(tableName).select("*").orderBy("id")
             expect(rows).toHaveLength(6)
             expect(rows[5].number).toEqual(0)