From 4c8f5524a9459cbe9a0395df71553ae66d4d5f2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguye=CC=82=CC=83n?= Date: Mon, 24 Feb 2020 18:29:09 -0800 Subject: [PATCH] [macos] Build macOS on CI But not mbgl. --- circle.yml | 12 +++--- .../xcshareddata/xcschemes/CI.xcscheme | 42 ------------------- 2 files changed, 6 insertions(+), 48 deletions(-) diff --git a/circle.yml b/circle.yml index e37fecede..1fec54085 100644 --- a/circle.yml +++ b/circle.yml @@ -22,7 +22,7 @@ workflows: only: /ios-.*/ branches: ignore: /.*/ - #- macos-debug + - macos-debug nightly: triggers: - schedule: @@ -177,9 +177,9 @@ commands: build-macos-test: steps: - run: - name: Build and run macOS tests - command: make run-test - no_output_timeout: 5m + name: Build macos-test + command: make macos-test + no_output_timeout: 20m check-public-symbols: @@ -202,7 +202,7 @@ commands: steps: - run: name: Install macOS dependencies - command: brew install cmake ccache + command: brew install cmake ccache pkg-config glfw3 collect-xcode-build-logs: steps: @@ -490,7 +490,7 @@ jobs: # ------------------------------------------------------------------------------ macos-debug: macos: - xcode: "10.1.0" + xcode: "11.2.1" environment: BUILDTYPE: Debug HOMEBREW_NO_AUTO_UPDATE: 1 diff --git a/platform/macos/macos.xcodeproj/xcshareddata/xcschemes/CI.xcscheme b/platform/macos/macos.xcodeproj/xcshareddata/xcschemes/CI.xcscheme index aae2f3219..5449adcb6 100644 --- a/platform/macos/macos.xcodeproj/xcshareddata/xcschemes/CI.xcscheme +++ b/platform/macos/macos.xcodeproj/xcshareddata/xcschemes/CI.xcscheme @@ -6,20 +6,6 @@ parallelizeBuildables = "YES" buildImplicitDependencies = "YES"> - - - - - - - - - - - -