From 5da64f56c002c9533f056e98d6e71064a991d027 Mon Sep 17 00:00:00 2001
From: Henry Mercer <henrymercer@github.com>
Date: Wed, 5 Apr 2023 20:14:37 +0100
Subject: [PATCH] Set up Swift in unset environment workflow

---
 .github/workflows/__multi-language-autodetect.yml | 2 +-
 .github/workflows/__unset-environment.yml         | 4 ++++
 pr-checks/checks/multi-language-autodetect.yml    | 2 +-
 pr-checks/checks/unset-environment.yml            | 4 ++++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/__multi-language-autodetect.yml b/.github/workflows/__multi-language-autodetect.yml
index cf2c68497e..ea4f00c6ee 100644
--- a/.github/workflows/__multi-language-autodetect.yml
+++ b/.github/workflows/__multi-language-autodetect.yml
@@ -83,7 +83,7 @@ jobs:
 
     - uses: ./../action/.github/actions/setup-swift
       with:
-        codeql-path: ${{steps.init.outputs.codeql-path}}
+        codeql-path: ${{ steps.init.outputs.codeql-path }}
 
     - name: Build code
       shell: bash
diff --git a/.github/workflows/__unset-environment.yml b/.github/workflows/__unset-environment.yml
index 146e29685e..54085d2dad 100644
--- a/.github/workflows/__unset-environment.yml
+++ b/.github/workflows/__unset-environment.yml
@@ -62,9 +62,13 @@ jobs:
       shell: bash
       run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV
     - uses: ./../action/init
+      id: init
       with:
         db-location: ${{ runner.temp }}/customDbLocation
         tools: ${{ steps.prepare-test.outputs.tools-url }}
+    - uses: ./../action/.github/actions/setup-swift
+      with:
+        codeql-path: ${{ steps.init.outputs.codeql-path }}
     - name: Build code
       shell: bash
     # Disable Kotlin analysis while it's incompatible with Kotlin 1.8, until we find a
diff --git a/pr-checks/checks/multi-language-autodetect.yml b/pr-checks/checks/multi-language-autodetect.yml
index 490b6fbf42..54d90d5f73 100644
--- a/pr-checks/checks/multi-language-autodetect.yml
+++ b/pr-checks/checks/multi-language-autodetect.yml
@@ -10,7 +10,7 @@ steps:
 
   - uses: ./../action/.github/actions/setup-swift
     with:
-      codeql-path: ${{steps.init.outputs.codeql-path}}
+      codeql-path: ${{ steps.init.outputs.codeql-path }}
 
   - name: Build code
     shell: bash
diff --git a/pr-checks/checks/unset-environment.yml b/pr-checks/checks/unset-environment.yml
index 965afcfd2e..2161bfc9dd 100644
--- a/pr-checks/checks/unset-environment.yml
+++ b/pr-checks/checks/unset-environment.yml
@@ -3,9 +3,13 @@ description: "An end-to-end integration test that unsets some environment variab
 operatingSystems: ["ubuntu"]
 steps:
   - uses: ./../action/init
+    id: init
     with:
       db-location: ${{ runner.temp }}/customDbLocation
       tools: ${{ steps.prepare-test.outputs.tools-url }}
+  - uses: ./../action/.github/actions/setup-swift
+    with:
+      codeql-path: ${{ steps.init.outputs.codeql-path }}
   - name: Build code
     shell: bash
     # Disable Kotlin analysis while it's incompatible with Kotlin 1.8, until we find a