From eb17dc2c6fefa319cdff36a2a4e466ab29d00e7a Mon Sep 17 00:00:00 2001
From: Henry Mercer <henrymercer@github.com>
Date: Mon, 17 Jun 2024 12:50:33 +0100
Subject: [PATCH] Add build mode to Swift autobuild check

---
 .github/workflows/__swift-autobuild.yml | 2 +-
 pr-checks/checks/swift-autobuild.yml    | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/__swift-autobuild.yml b/.github/workflows/__swift-autobuild.yml
index 3fc353cea..895946776 100644
--- a/.github/workflows/__swift-autobuild.yml
+++ b/.github/workflows/__swift-autobuild.yml
@@ -61,6 +61,7 @@ jobs:
         id: init
         with:
           languages: swift
+          build-mode: autobuild
           tools: ${{ steps.prepare-test.outputs.tools-url }}
       - uses: ./../action/.github/actions/setup-swift
         with:
@@ -83,5 +84,4 @@ jobs:
             exit 1
           fi
     env:
-      CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT: 'true' # Remove when Swift is GA.
       CODEQL_ACTION_TEST_MODE: true
diff --git a/pr-checks/checks/swift-autobuild.yml b/pr-checks/checks/swift-autobuild.yml
index f0a0cedfa..c7c17c35d 100644
--- a/pr-checks/checks/swift-autobuild.yml
+++ b/pr-checks/checks/swift-autobuild.yml
@@ -1,16 +1,13 @@
 name: "Swift analysis using autobuild"
 description: "Tests creation of a Swift database using autobuild"
-# versions: ["latest", "cached", "nightly-latest"]
 versions: ["nightly-latest"]
-# Swift autobuilder is only supported on MacOS for private beta
 operatingSystems: ["macos"]
-env:
-  CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT: "true" # Remove when Swift is GA.
 steps:
   - uses: ./../action/init
     id: init
     with:
       languages: swift
+      build-mode: autobuild
       tools: ${{ steps.prepare-test.outputs.tools-url }}
   - uses: ./../action/.github/actions/setup-swift
     with: