File tree Expand file tree Collapse file tree 3 files changed +7
-6
lines changed
Expand file tree Collapse file tree 3 files changed +7
-6
lines changed Original file line number Diff line number Diff line change 7777 CC : ${{ inputs.matrix_compiler_cc }}
7878 CFLAGS : ${{ inputs.matrix_compiler_cflags }}
7979 CXXFLAGS : ${{ inputs.matrix_compiler_cxxflags }}
80- bootstrap_args : " --enable-ccache --vcpkg-base-triplet=${{ inputs.vcpkg_base_triplet || (startsWith(inputs.matrix_image, 'ubuntu-') && 'x64-linux' || 'x64 -osx') }} ${{ inputs.bootstrap_args }} ${{ inputs.asan && '--enable-sanitizer=address' || '' }}"
80+ bootstrap_args : " --enable-ccache --vcpkg-base-triplet=${{ inputs.vcpkg_base_triplet || (startsWith(inputs.matrix_image, 'ubuntu-') && 'x64-linux' || 'arm64 -osx') }} ${{ inputs.bootstrap_args }} ${{ inputs.asan && '--enable-sanitizer=address' || '' }}"
8181 VCPKG_BINARY_SOURCES : ' clear;x-gha,readwrite'
8282 SCCACHE_GHA_ENABLED : " true"
8383 # Manylinux does not support Node 20 due to libc incompatibility. Temporarily opt out.
Original file line number Diff line number Diff line change 5757 uses : ./.github/workflows/ci-linux_mac.yml
5858 with :
5959 ci_backend : S3
60- matrix_image : macos-12
60+ matrix_image : macos-latest
6161 cmake_generator : ' Ninja' # Use Ninja due to performance issues.
6262 timeout : 120
6363 bootstrap_args : ' --enable=s3,serialization,tools --enable-release-symbols'
6666 uses : ./.github/workflows/ci-linux_mac.yml
6767 with :
6868 ci_backend : GCS
69- matrix_image : macos-12
69+ matrix_image : macos-latest
7070 cmake_generator : ' Ninja' # Use Ninja due to performance issues.
7171 timeout : 120
7272 bootstrap_args : ' --enable-gcs --enable-release-symbols'
@@ -101,7 +101,7 @@ jobs:
101101 uses : ./.github/workflows/ci-linux_mac.yml
102102 with :
103103 ci_backend : AZURE
104- matrix_image : macos-12
104+ matrix_image : macos-latest
105105 cmake_generator : ' Ninja' # Use Ninja due to performance issues.
106106 timeout : 120
107107 bootstrap_args : ' --enable-azure'
Original file line number Diff line number Diff line change @@ -61,11 +61,12 @@ jobs:
6161 cmake_args : -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=$PWD/cmake/arm64_linux_toolchain.cmake
6262 triplet : arm64-linux-release
6363 - platform : macos-x86_64
64- os : macos-12
64+ os : macos-latest
65+ cmake_args : -DCMAKE_OSX_ARCHITECTURES=x86_64
6566 MACOSX_DEPLOYMENT_TARGET : 11
6667 triplet : x64-osx-release
6768 - platform : macos-arm64
68- os : macos-12
69+ os : macos-latest
6970 cmake_args : -DCMAKE_OSX_ARCHITECTURES=arm64
7071 MACOSX_DEPLOYMENT_TARGET : 11
7172 triplet : arm64-osx-release
You can’t perform that action at this time.
0 commit comments