From e34b2e9f41ac7aa26a7affa7afe3c1ce5e2680cb Mon Sep 17 00:00:00 2001
From: Peter Dillinger <peterd@fb.com>
Date: Fri, 4 Dec 2020 23:22:18 -0800
Subject: [PATCH] Migrate away from broken macos on Travis (#7745)

Summary:
Add macos+cmake build on CircleCI instead.

Pull Request resolved: https://github.com/facebook/rocksdb/pull/7745

Test Plan: CI

Reviewed By: riversand963

Differential Revision: D25352864

Pulled By: pdillinger

fbshipit-source-id: 6b0a328cbe715bc3b43d70e919a27c834edcf079
---
 .circleci/config.yml | 26 ++++++++++++++++++++++++--
 .travis.yml          |  7 +++++++
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ea750c4f0..8b86a7d9a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -17,6 +17,13 @@ commands:
           command: |
             HOMEBREW_NO_AUTO_UPDATE=1 brew install pyenv
 
+  install-cmake-on-macos:
+    steps:
+      - run:
+          name: Install cmake on macos
+          command: |
+            HOMEBREW_NO_AUTO_UPDATE=1 brew install cmake
+
   increase-max-open-files-on-macos:
     steps:
       - run:
@@ -63,7 +70,7 @@ commands:
           name: Install gflags
           command: |
             sudo apt-get update -y && sudo apt-get install -y libgflags-dev
-  
+
   install-gflags-on-macos:
     steps:
       - run:
@@ -93,11 +100,23 @@ jobs:
     steps:
       - increase-max-open-files-on-macos
       - install-pyenv-on-macos
-      - pre-steps
       - install-gflags-on-macos
+      - pre-steps
       - run: ulimit -S -n 1048576 && OPT=-DCIRCLECI make V=1 J=32 -j32 check | .circleci/cat_ignore_eagain
       - post-steps
 
+  build-macos-cmake:
+    macos:
+      xcode: 11.3.0
+    steps:
+      - increase-max-open-files-on-macos
+      - install-pyenv-on-macos
+      - install-cmake-on-macos
+      - install-gflags-on-macos
+      - pre-steps
+      - run: ulimit -S -n 1048576 && (mkdir build && cd build && cmake -DWITH_GFLAGS=0 .. && make V=1 -j32) | .circleci/cat_ignore_eagain
+      - post-steps
+
   build-linux:
     machine:
       image: ubuntu-1604:202007-01
@@ -506,6 +525,9 @@ workflows:
   build-macos:
     jobs:
       - build-macos
+  build-macos-cmake:
+    jobs:
+      - build-macos-cmake
   build-cmake-mingw:
     jobs:
       - build-cmake-mingw
diff --git a/.travis.yml b/.travis.yml
index 421b7f160..51604a86e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -105,6 +105,13 @@ matrix:
     os: linux
     arch: ppc64le
     env: JOB_NAME=cmake
+  # Exclude all osx since it should be covered by CircleCI
+  - if: type = pull_request AND commit_message !~ /FULL_CI/
+    os: osx
+    env: TEST_GROUP=platform_dependent
+  - if: type = pull_request AND commit_message !~ /FULL_CI/
+    os: osx
+    env: JOB_NAME=cmake
   # NB: the cmake build is a partial java test
   - if: type = pull_request AND commit_message !~ /FULL_CI/
     os: osx