From b22d18cb358bd8c68f5808a240db5fd4ff759706 Mon Sep 17 00:00:00 2001
From: Martin Kinkelin <mkinkelin@symmetryinvestments.com>
Date: Tue, 5 Dec 2023 23:27:29 +0100
Subject: [PATCH] GHA: Test native macOS-arm64 job

---
 .github/workflows/main.yml | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 55a645c6ab8..cd93fbcd47c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -51,6 +51,18 @@ jobs:
               -DEXTRA_CXXFLAGS=-flto=full
             with_pgo: true
 
+          - job_name: macOS arm64
+            os: macos-14
+            arch: arm64
+            bootstrap_cmake_flags: >-
+              -DBUILD_LTO_LIBS=ON
+              -DD_COMPILER_FLAGS=-gcc=/usr/bin/c++
+            extra_cmake_flags: >-
+              -DBUILD_LTO_LIBS=ON
+              -DD_COMPILER_FLAGS="-gcc=/usr/bin/c++ -O -flto=full -defaultlib=phobos2-ldc-lto,druntime-ldc-lto -L-exported_symbol '-L__*' -L-w"
+              -DEXTRA_CXXFLAGS=-flto=full
+            with_pgo: true
+
           - job_name: Windows x64
             os: windows-2022
             arch: x64
@@ -76,7 +88,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     timeout-minutes: 150
     env:
-      MACOSX_DEPLOYMENT_TARGET: 10.12
+      MACOSX_DEPLOYMENT_TARGET: ${{ matrix.arch == 'arm64' && '11.0' || '10.12' }}
     steps:
       - uses: actions/checkout@v3
         with:
@@ -160,18 +172,6 @@ jobs:
       matrix:
         include:
 
-          - job_name: macOS arm64
-            host_os: macos-11
-            os: osx
-            arch: arm64
-            bootstrap_cmake_flags: -DD_COMPILER_FLAGS=-gcc=/usr/bin/c++
-            # see native macOS job comment for extra flags (https://github.com/ldc-developers/ldc/issues/4462)
-            extra_cmake_flags: >-
-              -DBUILD_LTO_LIBS=ON
-              -DD_COMPILER_FLAGS="-O -flto=full -defaultlib=phobos2-ldc-lto,druntime-ldc-lto -L-exported_symbol '-L__*' -L-w"
-              -DEXTRA_CXXFLAGS=-flto=full
-            with_pgo: true
-
           - job_name: Android armv7a
             host_os: ubuntu-20.04
             os: android
@@ -248,9 +248,7 @@ jobs:
     name: macOS universal
     runs-on: macos-latest
     timeout-minutes: 30
-    needs:
-      - build-native
-      - build-cross
+    needs: build-native
     steps:
       - uses: actions/checkout@v4
       - name: Merge x86_64 & arm64 packages to universal one