Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update macOS GitHub Actions images to macos-latest. #5350

Merged
merged 3 commits into from
Oct 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci-linux_mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ env:
CC: ${{ inputs.matrix_compiler_cc }}
CFLAGS: ${{ inputs.matrix_compiler_cflags }}
CXXFLAGS: ${{ inputs.matrix_compiler_cxxflags }}
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' || '' }}"
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' || '' }}"
VCPKG_BINARY_SOURCES: 'clear;x-gha,readwrite'
SCCACHE_GHA_ENABLED: "true"
# Manylinux does not support Node 20 due to libc incompatibility. Temporarily opt out.
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/full-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
uses: ./.github/workflows/ci-linux_mac.yml
with:
ci_backend: S3
matrix_image: macos-12
matrix_image: macos-latest
cmake_generator: 'Ninja' # Use Ninja due to performance issues.
timeout: 120
bootstrap_args: '--enable=s3,serialization,tools --enable-release-symbols'
Expand All @@ -66,7 +66,7 @@ jobs:
uses: ./.github/workflows/ci-linux_mac.yml
with:
ci_backend: GCS
matrix_image: macos-12
matrix_image: macos-latest
cmake_generator: 'Ninja' # Use Ninja due to performance issues.
timeout: 120
bootstrap_args: '--enable-gcs --enable-release-symbols'
Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:
uses: ./.github/workflows/ci-linux_mac.yml
with:
ci_backend: AZURE
matrix_image: macos-12
matrix_image: macos-latest
cmake_generator: 'Ninja' # Use Ninja due to performance issues.
timeout: 120
bootstrap_args: '--enable-azure'
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,12 @@ jobs:
cmake_args: -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=$PWD/cmake/arm64_linux_toolchain.cmake
triplet: arm64-linux-release
- platform: macos-x86_64
os: macos-12
os: macos-latest
cmake_args: -DCMAKE_OSX_ARCHITECTURES=x86_64
MACOSX_DEPLOYMENT_TARGET: 11
triplet: x64-osx-release
- platform: macos-arm64
os: macos-12
os: macos-latest
cmake_args: -DCMAKE_OSX_ARCHITECTURES=arm64
MACOSX_DEPLOYMENT_TARGET: 11
triplet: arm64-osx-release
Expand Down
Loading