Add Ruby and Swift language autodetect tests (#1369)

Co-authored-by: Henry Mercer <henry.mercer@me.com>

pr-checks/checks/multi-language-autodetect.yml

@@ -1,6 +1,8 @@
 name: "Multi-language repository"
 description: "An end-to-end integration test of a multi-language repository using automatic language detection"
 operatingSystems: ["ubuntu", "macos"]
+env:
+  CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT: "true" # Remove when Swift is GA.
 steps:
   - uses: ./../action/init
     with:
@@ -11,7 +13,8 @@ steps:
     run: ./build.sh
   - uses: ./../action/analyze
     id: analysis
-  - shell: bash
+  - name: Check language autodetect for all languages excluding Ruby, Swift
+    shell: bash
     run: |
       CPP_DB=${{ fromJson(steps.analysis.outputs.db-locations).cpp }}
       if [[ ! -d $CPP_DB ]] || [[ ! $CPP_DB == ${{ runner.temp }}/customDbLocation/* ]]; then
@@ -43,3 +46,17 @@ steps:
         echo "Did not create a database for Python, or created it in the wrong location."
         exit 1
       fi
+  - name: Check language autodetect for Ruby, Swift
+    if: "(matrix.version == 'cached' || matrix.version == 'latest' || matrix.version == 'nightly-latest')"
+    shell: bash
+    run: |
+      RUBY_DB=${{ fromJson(steps.analysis.outputs.db-locations).ruby }}
+      if [[ ! -d $RUBY_DB ]] || [[ ! $RUBY_DB == ${{ runner.temp }}/customDbLocation/* ]]; then
+        echo "Did not create a database for Ruby, or created it in the wrong location."
+        exit 1
+      fi
+      SWIFT_DB=${{ fromJson(steps.analysis.outputs.db-locations).swift }}
+      if [[ ! -d $SWIFT_DB ]] || [[ ! $SWIFT_DB == ${{ runner.temp }}/customDbLocation/* ]]; then
+        echo "Did not create a database for Swift, or created it in the wrong location."
+        exit 1
+      fi

pr-checks/checks/ruby-autodetect.yml

@@ -1,22 +0,0 @@
-# This check should be combined into `multi-language-autodetect.yml` once Ruby is GA'ed 
-# and the `CODEQL_ENABLE_EXPERIMENTAL_FEATURES` environment variable is not needed.
-name: "Ruby analysis using autodetect"
-description: "Tests creation of a Ruby database when language isn't specified in init"
-versions: ["latest", "cached", "nightly-latest"]
-operatingSystems: ["ubuntu", "macos"]
-env:
-  CODEQL_ENABLE_EXPERIMENTAL_FEATURES: "true"
-steps:
-  - uses: ./../action/init
-    with:
-      tools: ${{ steps.prepare-test.outputs.tools-url }}
-  - uses: ./../action/analyze
-    id: analysis
-  - 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