Skip to content

Commit

Permalink
Bump macos version (#1609)
Browse files Browse the repository at this point in the history
* Bump macos version

* bump android runners

* maybe 14 supports?

* Revert "maybe 14 supports?"

This reverts commit ae0fc43.

* 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
  • Loading branch information
egecetin authored Oct 14, 2024
1 parent db905ad commit 2eb3fc6
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 12 deletions.
20 changes: 12 additions & 8 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
23 changes: 20 additions & 3 deletions .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ coverage:

codecov:
notify:
after_n_builds: 16
after_n_builds: 19
wait_for_ci: yes

ignore:
Expand Down

0 comments on commit 2eb3fc6

Please sign in to comment.