From 4133758885260001d5563500cbbc2cf55465e37b Mon Sep 17 00:00:00 2001 From: egecetin Date: Sat, 5 Oct 2024 17:23:00 +0300 Subject: [PATCH 01/13] Bump macos version --- .github/workflows/build_and_test.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 7f96abd31..50da9ea12 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -289,14 +289,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 @@ -313,6 +305,14 @@ jobs: host-arch: arm64 arch: arm64 config-zstd: OFF + - os-version: macos-15 + host-arch: x86_64 + arch: x86_64 + config-zstd: OFF + - os-version: macos-15 + host-arch: x86_64 + arch: arm64 + config-zstd: OFF steps: - name: Checkout code From 61a821f28ecbeaf90753f6ec8cbf9979febc4981 Mon Sep 17 00:00:00 2001 From: egecetin Date: Sat, 5 Oct 2024 18:23:24 +0300 Subject: [PATCH 02/13] bump android runners --- .github/workflows/build_and_test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 50da9ea12..21d03fb7d 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -628,11 +628,11 @@ jobs: - run-on-os: ubuntu-20.04 target: x86 api-version: 30 - - run-on-os: macos-12 + - run-on-os: macos-15 target: arm64-v8a cmake_configure: "-DCMAKE_OSX_ARCHITECTURES=arm64" api-version: 30 - - run-on-os: macos-12 + - run-on-os: macos-15 target: x86_64 cmake_configure: "-DCMAKE_OSX_ARCHITECTURES=x86_64" api-version: 30 From ae0fc433bce2be517708b8b47f143eec1325abc5 Mon Sep 17 00:00:00 2001 From: egecetin Date: Sat, 5 Oct 2024 18:46:34 +0300 Subject: [PATCH 03/13] maybe 14 supports? --- .github/workflows/build_and_test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 21d03fb7d..3e9627010 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -628,11 +628,11 @@ jobs: - run-on-os: ubuntu-20.04 target: x86 api-version: 30 - - run-on-os: macos-15 + - run-on-os: macos-14 target: arm64-v8a cmake_configure: "-DCMAKE_OSX_ARCHITECTURES=arm64" api-version: 30 - - run-on-os: macos-15 + - run-on-os: macos-14 target: x86_64 cmake_configure: "-DCMAKE_OSX_ARCHITECTURES=x86_64" api-version: 30 From 340e8248c91297762642cebd7dfb8a37a2fb1e5d Mon Sep 17 00:00:00 2001 From: egecetin Date: Sat, 5 Oct 2024 21:11:54 +0300 Subject: [PATCH 04/13] Revert "maybe 14 supports?" This reverts commit ae0fc433bce2be517708b8b47f143eec1325abc5. --- .github/workflows/build_and_test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 3e9627010..21d03fb7d 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -628,11 +628,11 @@ jobs: - run-on-os: ubuntu-20.04 target: x86 api-version: 30 - - run-on-os: macos-14 + - run-on-os: macos-15 target: arm64-v8a cmake_configure: "-DCMAKE_OSX_ARCHITECTURES=arm64" api-version: 30 - - run-on-os: macos-14 + - run-on-os: macos-15 target: x86_64 cmake_configure: "-DCMAKE_OSX_ARCHITECTURES=x86_64" api-version: 30 From d65e8d27bb56b1657e675abcfc9ea940ba17e963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ege=20=C3=87etin?= Date: Thu, 10 Oct 2024 09:33:17 +0300 Subject: [PATCH 05/13] update packaging --- .github/workflows/package.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index d4c7f8f8e..e0f09c6d7 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -128,13 +128,14 @@ 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: + os-version: [macos-14, macos-15] xcode-version: [15.4, 14.3.1] arch: [x86_64, arm64] From ddd8863badb5eb3cca33952288665357f072ee83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ege=20=C3=87etin?= Date: Thu, 10 Oct 2024 11:13:34 +0300 Subject: [PATCH 06/13] fix xcode-versions --- .github/workflows/package.yml | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index e0f09c6d7..908552388 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -135,9 +135,25 @@ jobs: id-token: write strategy: matrix: - os-version: [macos-14, macos-15] - 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.1 + arch: x86_64 + - os-version: macos-15 + xcode-version: 16.1 + arch: arm64 steps: - uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0 From 9f65a7925e1485fae1edf65858403d9676968bb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ege=20=C3=87etin?= Date: Thu, 10 Oct 2024 11:19:19 +0300 Subject: [PATCH 07/13] what about 16.0.0 --- .github/workflows/package.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 908552388..c45d5065c 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -149,10 +149,10 @@ jobs: xcode-version: 14.3.1 arch: arm64 - os-version: macos-15 - xcode-version: 16.1 + xcode-version: 16.0.0 arch: x86_64 - os-version: macos-15 - xcode-version: 16.1 + xcode-version: 16.0.0 arch: arm64 steps: From 8613ef507e9423f3c4a1223cdedc9b5d73fef384 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ege=20=C3=87etin?= Date: Fri, 11 Oct 2024 10:00:58 +0300 Subject: [PATCH 08/13] use arm64 --- .github/workflows/build_and_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 21d03fb7d..041433642 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -310,7 +310,7 @@ jobs: arch: x86_64 config-zstd: OFF - os-version: macos-15 - host-arch: x86_64 + host-arch: arm64 arch: arm64 config-zstd: OFF From 204aaeaf9931c8440921b223811c9adae7c0080b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ege=20=C3=87etin?= Date: Fri, 11 Oct 2024 10:15:16 +0300 Subject: [PATCH 09/13] adjust n builds --- codecov.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codecov.yml b/codecov.yml index 846afb774..cbe67b99a 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: From 54e62ba2a7b61f409f9b4bd29fdf2284975fb56d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ege=20=C3=87etin?= Date: Fri, 11 Oct 2024 10:15:24 +0300 Subject: [PATCH 10/13] add missing macos14 --- .github/workflows/build_and_test.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 041433642..2ac03fe60 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -301,6 +301,10 @@ jobs: host-arch: x86_64 arch: arm64 config-zstd: OFF + - os-version: macos-14 + host-arch: x86_64 + arch: x86_64 + config-zstd: ON - os-version: macos-14 host-arch: arm64 arch: arm64 @@ -308,7 +312,7 @@ jobs: - os-version: macos-15 host-arch: x86_64 arch: x86_64 - config-zstd: OFF + config-zstd: ON - os-version: macos-15 host-arch: arm64 arch: arm64 From 0fce87cc60c1757736aa1b49f918b4ce4f01effd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ege=20=C3=87etin?= Date: Fri, 11 Oct 2024 10:35:21 +0300 Subject: [PATCH 11/13] zstd --- .github/workflows/build_and_test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 2ac03fe60..3f7a1a813 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -304,19 +304,19 @@ jobs: - os-version: macos-14 host-arch: x86_64 arch: x86_64 - config-zstd: ON + config-zstd: OFF - os-version: macos-14 host-arch: arm64 arch: arm64 - config-zstd: OFF + config-zstd: ON - os-version: macos-15 host-arch: x86_64 arch: x86_64 - config-zstd: ON + config-zstd: OFF - os-version: macos-15 host-arch: arm64 arch: arm64 - config-zstd: OFF + config-zstd: ON steps: - name: Checkout code From c7f4ab52f378a3ba5e8b0cfedaa926c8a448b4b8 Mon Sep 17 00:00:00 2001 From: egecetin Date: Sun, 13 Oct 2024 09:52:14 +0300 Subject: [PATCH 12/13] try macos-13 --- .github/workflows/build_and_test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 3f7a1a813..fbf0631dc 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -632,11 +632,11 @@ jobs: - run-on-os: ubuntu-20.04 target: x86 api-version: 30 - - run-on-os: macos-15 + - run-on-os: macos-13 target: arm64-v8a cmake_configure: "-DCMAKE_OSX_ARCHITECTURES=arm64" api-version: 30 - - run-on-os: macos-15 + - run-on-os: macos-13 target: x86_64 cmake_configure: "-DCMAKE_OSX_ARCHITECTURES=x86_64" api-version: 30 From fc15c6c07d9da6405adc8e723504b4a9889856a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ege=20=C3=87etin?= Date: Mon, 14 Oct 2024 10:29:49 +0300 Subject: [PATCH 13/13] revert android builds to macos12 for now --- .github/workflows/build_and_test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index fbf0631dc..220d27358 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -632,11 +632,11 @@ jobs: - run-on-os: ubuntu-20.04 target: x86 api-version: 30 - - run-on-os: macos-13 + - run-on-os: macos-12 target: arm64-v8a cmake_configure: "-DCMAKE_OSX_ARCHITECTURES=arm64" api-version: 30 - - run-on-os: macos-13 + - run-on-os: macos-12 target: x86_64 cmake_configure: "-DCMAKE_OSX_ARCHITECTURES=x86_64" api-version: 30