From 9abcab94b6ce3ee78b837d0dda2c3008a7fde0b9 Mon Sep 17 00:00:00 2001
From: Doug <douglase@element.io>
Date: Wed, 25 May 2022 17:38:10 +0100
Subject: [PATCH] Update CI to use macOS 12 and Xcode 13.4.

---
 .github/workflows/ci-build.yml      | 2 +-
 .github/workflows/ci-tests.yml      | 2 +-
 .github/workflows/ci-ui-tests.yml   | 2 +-
 .github/workflows/release-alpha.yml | 4 ++--
 changelog.d/pr-6204.build           | 1 +
 fastlane/Fastfile                   | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 changelog.d/pr-6204.build

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 46a6fab45..e11eca47a 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -15,7 +15,7 @@ env:
 jobs:
   build:
     name: Build
-    runs-on: macos-11
+    runs-on: macos-12
     
     # Concurrency group not needed as this workflow only runs on develop which we always want to test.
 
diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index fa3af8d1d..baba82853 100644
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -16,7 +16,7 @@ env:
 jobs:
   tests:
     name: Tests
-    runs-on: macos-11
+    runs-on: macos-12
     
     concurrency:
       # When running on develop, use the sha to allow all runs of this workflow to run concurrently.
diff --git a/.github/workflows/ci-ui-tests.yml b/.github/workflows/ci-ui-tests.yml
index fb65d471d..28d7a2894 100644
--- a/.github/workflows/ci-ui-tests.yml
+++ b/.github/workflows/ci-ui-tests.yml
@@ -14,7 +14,7 @@ env:
 jobs:
   tests:
     name: UI Tests
-    runs-on: macos-11
+    runs-on: macos-12
     
     concurrency:
       # Only allow a single run of this workflow on each branch, automatically cancelling older runs.
diff --git a/.github/workflows/release-alpha.yml b/.github/workflows/release-alpha.yml
index d8222469f..889f57a75 100644
--- a/.github/workflows/release-alpha.yml
+++ b/.github/workflows/release-alpha.yml
@@ -14,7 +14,7 @@ env:
 
 jobs:
   check-secret:
-    runs-on: macos-11
+    runs-on: macos-12
     outputs:
       out-key: ${{ steps.out-key.outputs.defined }}
     steps:
@@ -29,7 +29,7 @@ jobs:
     needs: [check-secret]
     if: needs.check-secret.outputs.out-key == 'true'
     name: Release
-    runs-on: macos-11
+    runs-on: macos-12
     
     concurrency:
       # Only allow a single run of this workflow on each branch, automatically cancelling older runs.
diff --git a/changelog.d/pr-6204.build b/changelog.d/pr-6204.build
new file mode 100644
index 000000000..cb30f7c8b
--- /dev/null
+++ b/changelog.d/pr-6204.build
@@ -0,0 +1 @@
+CI: Use macOS 12 and Xcode 13.4
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index f56329733..cab6ca261 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -21,7 +21,7 @@ platform :ios do
 
   before_all do
     # Ensure used Xcode version
-    xcversion(version: "~> 13.2")
+    xcversion(version: "~> 13.4")
   end
 
   #### Public ####