From 2eb3fc65bb547fb1017679f3b2a814a47bffc865 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ege=20=C3=87etin?=
 <64282645+egecetin@users.noreply.github.com>
Date: Mon, 14 Oct 2024 12:17:37 +0300
Subject: [PATCH] Bump macos version (#1609)

* Bump macos version

* bump android runners

* maybe 14 supports?

* Revert "maybe 14 supports?"

This reverts commit ae0fc433bce2be517708b8b47f143eec1325abc5.

* update packaging

* fix xcode-versions

* what about 16.0.0

* use arm64

* adjust n builds

* add missing macos14

* zstd

* try macos-13

* revert android builds to macos12 for now
---
 .github/workflows/build_and_test.yml | 20 ++++++++++++--------
 .github/workflows/package.yml        | 23 ++++++++++++++++++++---
 codecov.yml                          |  2 +-
 3 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 43e4027b63..be7428bfd9 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -287,14 +287,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - os-version: macos-12
-            host-arch: x86_64
-            arch: x86_64
-            config-zstd: OFF
-          - os-version: macos-12
-            host-arch: x86_64
-            arch: arm64
-            config-zstd: OFF
           - os-version: macos-13
             host-arch: x86_64
             arch: x86_64
@@ -307,10 +299,22 @@ jobs:
             host-arch: x86_64
             arch: arm64
             config-zstd: OFF
+          - os-version: macos-14
+            host-arch: x86_64
+            arch: x86_64
+            config-zstd: OFF
           - os-version: macos-14
             host-arch: arm64
             arch: arm64
+            config-zstd: ON
+          - os-version: macos-15
+            host-arch: x86_64
+            arch: x86_64
             config-zstd: OFF
+          - os-version: macos-15
+            host-arch: arm64
+            arch: arm64
+            config-zstd: ON
 
     steps:
       - name: Checkout code
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index d4c7f8f8e1..c45d5065c2 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -128,15 +128,32 @@ jobs:
           artifacts: "${{ env.BUILD_DIR }}/*.tar.gz"
 
   macos:
-    runs-on: macos-14
+    runs-on: ${{ matrix.os-version }}
     permissions:
       contents: write
       attestations: write
       id-token: write
     strategy:
       matrix:
-        xcode-version: [15.4, 14.3.1]
-        arch: [x86_64, arm64]
+        include:
+          - os-version: macos-14
+            xcode-version: 15.4
+            arch: x86_64
+          - os-version: macos-14
+            xcode-version: 15.4
+            arch: arm64
+          - os-version: macos-14
+            xcode-version: 14.3.1
+            arch: x86_64
+          - os-version: macos-14
+            xcode-version: 14.3.1
+            arch: arm64
+          - os-version: macos-15
+            xcode-version: 16.0.0
+            arch: x86_64
+          - os-version: macos-15
+            xcode-version: 16.0.0
+            arch: arm64
 
     steps:
       - uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0
diff --git a/codecov.yml b/codecov.yml
index 846afb7749..cbe67b99ae 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -7,7 +7,7 @@ coverage:
 
 codecov:
   notify:
-    after_n_builds: 16
+    after_n_builds: 19
     wait_for_ci: yes
 
 ignore: