Add back CMake build config for macOS (#2729)

Co-authored-by: Andrew Calcutt <acalcutt@techidiots.net>
This commit is contained in:
Bart Louwers
2024-08-22 01:13:42 +02:00
committed by GitHub
parent a4258ccbb8
commit d377bcc5ba
12 changed files with 305 additions and 61 deletions

View File

@@ -80,5 +80,3 @@ jobs:
- name: Generate Xcode project for macOS
run: bazel run //platform/macos:xcodeproj --@rules_xcodeproj//xcodeproj:extra_common_flags="--//:renderer=metal"

View File

@@ -78,12 +78,10 @@ jobs:
arch: x86_64
- runs-on: [self-hosted, linux, ARM64]
arch: arm64
# Disabled until Metal backend is complete
# A release for macOS can be made from the opengl-2 branch
# - runs-on: macos-12
# arch: x86_64
# - runs-on: macos-13-xlarge
# arch: arm64
- runs-on: macos-14
arch: arm64
- runs-on: macos-14-large
arch: x86_64
- runs-on: windows-2022
arch: x86_64
continue-on-error: true
@@ -209,7 +207,12 @@ jobs:
-G Ninja \
-DCMAKE_BUILD_TYPE=${{ env.BUILDTYPE }} \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DMLN_WITH_NODE=ON
-DMLN_WITH_NODE=ON \
-DMLN_WITH_OPENGL=OFF \
-DMLN_WITH_METAL=ON \
-DMLN_LEGACY_RENDERER=OFF \
-DMLN_DRAWABLE_RENDERER=ON \
-DMLN_WITH_WERROR=OFF
- name: Configure maplibre-native (Linux)
if: runner.os == 'Linux'
@@ -261,13 +264,17 @@ jobs:
- name: Run render tests on macOS
if: runner.os == 'macOS'
run: set -o pipefail && ./build/mbgl-render-test-runner --manifestPath metrics/macos-xcode11-release-style.json
# A few are failing
# https://github.com/maplibre/maplibre-native/issues/2741
# Almost all are failing on Intel GitHub runners (but only on CI)
continue-on-error: true
run: ./build/mbgl-render-test-runner --manifestPath metrics/macos-xcode11-release-style.json
- name: Upload render test artifacts (MacOS)
if: runner.os == 'MacOS'
uses: actions/upload-artifact@v4
with:
name: render-query-test-results
name: render-query-test-results_${{ runner.os }}_${{ matrix.arch }}
path: metrics/macos-xcode11-release-style.html
- name: Test (Linux)
@@ -277,6 +284,7 @@ jobs:
- name: Test (MacOS)
if: runner.os == 'MacOS'
continue-on-error: true # flaky on CI
working-directory: platform/node
run: npm test