From 74f0a8fdb70d160c97139204b4560e2d5bf94cdc Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Tue, 24 Nov 2020 11:20:16 +0100
Subject: [PATCH 1/3] Check query compilation and formatting in `qltest.yml`

---
 .github/workflows/qltest.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/qltest.yml b/.github/workflows/qltest.yml
index 8305af33033..e792fcb8566 100644
--- a/.github/workflows/qltest.yml
+++ b/.github/workflows/qltest.yml
@@ -30,5 +30,7 @@ jobs:
       - name: Build Extractor
         run: env "PATH=$PATH:${{ github.workspace }}/codeql" ./create-extractor-pack.sh
       - name: Run QL tests
-        run: codeql/codeql test run --check-databases --check-unused-labels --search-path "${{ github.workspace }}" --consistency-queries ql/consistency-queries ql/test
-
+        run: |
+          codeql/codeql test run --check-databases --check-unused-labels --search-path "${{ github.workspace }}" --consistency-queries ql/consistency-queries ql/test
+          find ql "(" -name "*.ql" -or -name "*.qll" ")" -print0 | xargs -0 codeql/codeql query format --check-only
+          codeql/codeql query compile --check-only --threads=4 --warnings=error --search-path "${{ github.workspace }}" "ql/src" "ql/examples"

From 966e1cdcd09f012ebb888b48063a09e951d23af8 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Tue, 24 Nov 2020 11:26:47 +0100
Subject: [PATCH 2/3] Apply old formatter to make CI check pass

---
 ql/src/codeql_ruby/Variables.qll | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/ql/src/codeql_ruby/Variables.qll b/ql/src/codeql_ruby/Variables.qll
index dbd33af1132..0cb83aaee41 100644
--- a/ql/src/codeql_ruby/Variables.qll
+++ b/ql/src/codeql_ruby/Variables.qll
@@ -18,20 +18,18 @@ private predicate scopeDefinesParameter(VariableScope scope, string name, Locati
   exists(Identifier var |
     name = var.getValue() and
     location = var.getLocation() and
-    var in [
-        scope
-            .(BlockScope)
-            .getScopeElement()
-            .getAFieldOrChild()
-            .(BlockParameters)
-            .getAFieldOrChild+(),
-        scope
-            .(MethodScope)
-            .getScopeElement()
-            .getAFieldOrChild()
-            .(MethodParameters)
-            .getAFieldOrChild+()
-      ]
+    var in [scope
+              .(BlockScope)
+              .getScopeElement()
+              .getAFieldOrChild()
+              .(BlockParameters)
+              .getAFieldOrChild+(),
+          scope
+              .(MethodScope)
+              .getScopeElement()
+              .getAFieldOrChild()
+              .(MethodParameters)
+              .getAFieldOrChild+()]
   )
 }
 

From eceeb6a5fd44106c3bdc2966b3c3ade87160a7f2 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Tue, 24 Nov 2020 11:47:59 +0100
Subject: [PATCH 3/3] Break up QL CI tests into separatly named steps

---
 .github/workflows/qltest.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/qltest.yml b/.github/workflows/qltest.yml
index e792fcb8566..3b8d870a61b 100644
--- a/.github/workflows/qltest.yml
+++ b/.github/workflows/qltest.yml
@@ -30,7 +30,8 @@ jobs:
       - name: Build Extractor
         run: env "PATH=$PATH:${{ github.workspace }}/codeql" ./create-extractor-pack.sh
       - name: Run QL tests
-        run: |
-          codeql/codeql test run --check-databases --check-unused-labels --search-path "${{ github.workspace }}" --consistency-queries ql/consistency-queries ql/test
-          find ql "(" -name "*.ql" -or -name "*.qll" ")" -print0 | xargs -0 codeql/codeql query format --check-only
-          codeql/codeql query compile --check-only --threads=4 --warnings=error --search-path "${{ github.workspace }}" "ql/src" "ql/examples"
+        run: codeql/codeql test run --check-databases --check-unused-labels --search-path "${{ github.workspace }}" --consistency-queries ql/consistency-queries ql/test
+      - name: Check QL formatting
+        run: find ql "(" -name "*.ql" -or -name "*.qll" ")" -print0 | xargs -0 codeql/codeql query format --check-only
+      - name: Check QL compilation
+        run: codeql/codeql query compile --check-only --threads=4 --warnings=error --search-path "${{ github.workspace }}" "ql/src" "ql/examples"