From 0e13b9009657b4597143a68204357793dbbbbf4d Mon Sep 17 00:00:00 2001 From: Mikhail Bautin <552936+mbautin@users.noreply.github.com> Date: Tue, 24 Sep 2024 15:54:02 -0700 Subject: [PATCH] Use macOS 13, specify architecture CI build types: *macos* --- .github/workflows/ci.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 83eff5a3..1ead84f9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,6 +33,9 @@ jobs: build: name: ${{ matrix.name }} runs-on: ${{ matrix.os }} + # This was added for controlling hosted macOS runner architecture. We use a different way to + # specify the architecture for Linux builds. + arch: ${{ matrix.architecture }} if: > (github.event_name == 'push' && !contains(github.event.head_commit.message, 'skip ci') && @@ -217,13 +220,13 @@ jobs: # --------------------------------------------------------------------------------------- - name: macos-x86_64 - os: macos-12 + os: macos-13 docker_image: build_thirdparty_args: --enforce_arch=x86_64 architecture: x86_64 - name: macos-arm64 - os: macos-12 + os: macos-13 docker_image: build_thirdparty_args: architecture: arm64 --enforce_arch=arm64