[WIP] Fix CI for OSX.

hyperball · Jul 30, 2018 · bf189c8 · bf189c8
1 parent b4081c4
commit bf189c8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/tools/ci/deploy_docs.sh b/tools/ci/deploy_docs.sh
@@ -83,7 +83,7 @@ pushd "$TARGET_DIR"
 	cp -a "$DOXYGEN_HTML_DIR/." ./
 
 	# Copy CircleCI config directory.
-	cp -a "$CIRCLECI_CONFIG_DIR/." ./
+	cp -R "$CIRCLECI_CONFIG_DIR" ./
 
 	# Set user name and email for commit.
 	git config user.name "Travis CI"

diff --git a/tools/ci/install_deps.sh b/tools/ci/install_deps.sh
@@ -33,8 +33,8 @@ pushd "$DEPS_DIR"
 
 	# Install CMake-3.11.0 from binary package.
 	if [ "$TRAVIS_OS_NAME" == "osx" ]; then
-		https://cmake.org/files/v3.11/cmake-3.11.0-Darwin-x86_64.tar.gz
-		sudo tar xf cmake-3.11.0-Darwin-x86_64.tar.gz --strip 1 -C /usr/local
+		wget https://cmake.org/files/v3.11/cmake-3.11.0-Darwin-x86_64.tar.gz
+		sudo tar xf cmake-3.11.0-Darwin-x86_64.tar.gz --strip 3 -C /usr/local
 	else
 		wget https://cmake.org/files/v3.11/cmake-3.11.0-Linux-x86_64.tar.gz
 		sudo tar xf cmake-3.11.0-Linux-x86_64.tar.gz --strip 1 -C /usr/local