From 251c779be8b3522155ceda2aac934439da75e4c3 Mon Sep 17 00:00:00 2001
From: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>
Date: Thu, 28 Nov 2024 09:18:43 +0100
Subject: [PATCH] Revert "Cherrypick darwin build fix due to github macos
 runner move to arm64 (#33173)"

This reverts commit 2416796686db5e2fb53781385c7c4d2fab20cf04.

Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>
---
 .github/workflows/build.yaml         | 2 +-
 .github/workflows/darwin-tests.yaml  | 2 +-
 .github/workflows/darwin.yaml        | 8 ++++----
 .github/workflows/fuzzing-build.yaml | 2 +-
 .github/workflows/tests.yaml         | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 15426214f49ad0..1da7dd09665706 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -369,7 +369,7 @@ jobs:
 
     build_darwin:
         name: Build on Darwin (clang, python_lib, simulated)
-        runs-on: macos-13
+        runs-on: macos-latest
         if: github.actor != 'restyled-io[bot]'
 
         steps:
diff --git a/.github/workflows/darwin-tests.yaml b/.github/workflows/darwin-tests.yaml
index 56fd5856428e10..e6e14ec4929a11 100644
--- a/.github/workflows/darwin-tests.yaml
+++ b/.github/workflows/darwin-tests.yaml
@@ -49,7 +49,7 @@ jobs:
             LSAN_OPTIONS: detect_leaks=1 malloc_context_size=40 suppressions=scripts/tests/chiptest/lsan-mac-suppressions.txt
 
         if: github.actor != 'restyled-io[bot]'
-        runs-on: macos-13
+        runs-on: macos-latest
 
         steps:
             - name: Checkout
diff --git a/.github/workflows/darwin.yaml b/.github/workflows/darwin.yaml
index c907318af10e07..1555032827dd28 100644
--- a/.github/workflows/darwin.yaml
+++ b/.github/workflows/darwin.yaml
@@ -31,7 +31,7 @@ jobs:
     framework:
         name: Build framework
         if: github.actor != 'restyled-io[bot]'
-        runs-on: macos-13
+        runs-on: macos-latest
         strategy:
             matrix:
                 options: # We don't need a full matrix
@@ -68,7 +68,7 @@ jobs:
     tests:
         name: Run framework tests
         if: github.actor != 'restyled-io[bot]'
-        runs-on: macos-13
+        runs-on: macos-latest
         strategy:
             matrix:
                 options: # We don't need a full matrix
@@ -131,7 +131,7 @@ jobs:
     tv-casting-bridge:
         name: Build TV Casting Bridge example
         if: github.actor != 'restyled-io[bot]'
-        runs-on: macos-13
+        runs-on: macos-latest
         steps:
             - name: Checkout
               uses: actions/checkout@v4
@@ -148,7 +148,7 @@ jobs:
     darwin:
         name: Build Darwin # Matches the previous monolithic build that's marked "required" for PRs
         needs: [ framework, tests ]
-        runs-on: macos-13
+        runs-on: macos-latest
         steps:
             - name: Done
               run: 'true' # nothing to do
diff --git a/.github/workflows/fuzzing-build.yaml b/.github/workflows/fuzzing-build.yaml
index c688a6023f13bf..f354ce369c27fd 100644
--- a/.github/workflows/fuzzing-build.yaml
+++ b/.github/workflows/fuzzing-build.yaml
@@ -68,7 +68,7 @@ jobs:
 
     build_darwin_fuzzing:
         name: Build on Darwin
-        runs-on: macos-13
+        runs-on: macos-latest
         if: github.actor != 'restyled-io[bot]'
 
         steps:
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 5f6ca951648dac..2907a4a89711ea 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -328,7 +328,7 @@ jobs:
             LSAN_OPTIONS: detect_leaks=1 suppressions=scripts/tests/chiptest/lsan-mac-suppressions.txt
 
         if: github.actor != 'restyled-io[bot]'
-        runs-on: macos-13
+        runs-on: macos-latest
 
         steps:
             - name: Checkout
@@ -584,7 +584,7 @@ jobs:
             TSAN_OPTIONS: "halt_on_error=1"
 
         if: github.actor != 'restyled-io[bot]' && false
-        runs-on: macos-13
+        runs-on: macos-latest
 
         steps:
             - name: Checkout