Skip to content

Commit 15bc3c5

Browse files
authored
Add OSX to CI (open-telemetry#20)
* Add OSX to CI * Fix yaml * Fix osx build. * Update xcode. * Change build dir default path. * Fix path * Alias bazel on osx. * set up bazel symbol link on osx
1 parent b61d5fb commit 15bc3c5

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

.circleci/config.yml

+10-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- run: ./ci/setup_cmake.sh
1515
- run: ./ci/do_ci.sh cmake.test
1616
- store_artifacts:
17-
path: /build/Testing/Temporary/LastTest.log
17+
path: ~/build/Testing/Temporary/LastTest.log
1818
destination: Test.log
1919

2020
bazel_test:
@@ -27,6 +27,14 @@ jobs:
2727
- run: ./ci/install_bazelisk.sh
2828
- run: ./ci/do_ci.sh bazel.test
2929

30+
osx_test:
31+
macos:
32+
xcode: "11.0.0"
33+
steps:
34+
- checkout
35+
- run: ./ci/install_osx_bazelisk.sh
36+
- run: ./ci/do_ci.sh bazel.test
37+
3038
windows:
3139
executor: win/vs2019
3240
steps:
@@ -41,4 +49,5 @@ workflows:
4149
jobs:
4250
- cmake_test
4351
- bazel_test
52+
- osx_test
4453
- windows

ci/do_ci.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -e
44

55
[ -z "${SRC_DIR}" ] && export SRC_DIR="`pwd`"
6-
[ -z "${BUILD_DIR}" ] && export BUILD_DIR=/build
6+
[ -z "${BUILD_DIR}" ] && export BUILD_DIR=$HOME/build
77
mkdir -p "${BUILD_DIR}"
88

99
BAZEL_OPTIONS=""

ci/install_osx_bazelisk.sh

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash
2+
3+
set -e
4+
5+
brew install bazelisk
6+
sudo ln -s /usr/local/bin/bazelisk /usr/local/bin/bazel

0 commit comments

Comments
 (0)