From b22fb4674b8f397e298dc8fe22c6c1f923855188 Mon Sep 17 00:00:00 2001
From: Henning Makholm <hmakholm@github.com>
Date: Mon, 9 Aug 2021 13:22:25 +0200
Subject: [PATCH 1/2] Update CodeQL bundle to 20210809 / 2.5.9

---
 lib/defaults.json | 2 +-
 src/defaults.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/defaults.json b/lib/defaults.json
index 57056c17db..f85c162400 100644
--- a/lib/defaults.json
+++ b/lib/defaults.json
@@ -1,3 +1,3 @@
 {
-    "bundleVersion": "codeql-bundle-20210726"
+    "bundleVersion": "codeql-bundle-20210809"
 }
diff --git a/src/defaults.json b/src/defaults.json
index 77c5fcd070..433fede91d 100644
--- a/src/defaults.json
+++ b/src/defaults.json
@@ -1,3 +1,3 @@
 {
-	"bundleVersion": "codeql-bundle-20210726"
+	"bundleVersion": "codeql-bundle-20210809"
 }

From 53cfc95284579b53473226edc777592a231d59e4 Mon Sep 17 00:00:00 2001
From: Aditya Sharad <adityasharad@github.com>
Date: Thu, 5 Aug 2021 16:51:32 -0700
Subject: [PATCH 2/2] Add PR check job for Ruby beta

Add a separate job that analyses the multilanguage test repo's Ruby code.
For now, run this only with the latest released CodeQL build from defaults.json.
The cached builds and nightly builds don't support Ruby yet.

In future, we can update this and other PR checks to test a wider range of cases.
---
 .github/workflows/pr-checks.yml | 41 +++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
index 7bc1a76e13..47c301d409 100644
--- a/.github/workflows/pr-checks.yml
+++ b/.github/workflows/pr-checks.yml
@@ -497,6 +497,47 @@ jobs:
           exit 1
         fi
 
+  # Ruby is in beta, so test it separately for now.
+  multi-language-repo_test-ruby:
+    needs: [check-js, check-node-modules, check-codeql-versions]
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        tools:
+          - latest
+          # TODO: Uncomment when nightly builds also support Ruby in beta.
+          # - ${{ needs.check-codeql-versions.outputs.nightly-url }}
+    runs-on: ${{ matrix.os }}
+    env:
+      CODEQL_ENABLE_EXPERIMENTAL_FEATURES: true
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Move codeql-action
+      shell: bash
+      run: |
+        mkdir ../action
+        mv * .github ../action/
+        mv ../action/tests/multi-language-repo/{*,.github} .
+        mv ../action/.github/workflows .github
+    - uses: ./../action/init
+      with:
+        languages: ruby
+        tools: ${{ matrix.tools }}
+    - uses: ./../action/analyze
+      id: analysis
+      env:
+        TEST_MODE: true
+    - name: Check database
+      shell: bash
+      run: |
+        RUBY_DB="${{ fromJson(steps.analysis.outputs.db-locations).ruby }}"
+        if [[ ! -d "$RUBY_DB" ]]; then
+          echo "Did not create a database for Ruby."
+          exit 1
+        fi
+
   multi-language-repo_rubocop:
     needs: [check-js, check-node-modules]
     runs-on: ubuntu-latest