Skip to content

Commit 14bdfec

Browse files
committed
Updated Travis tests
1 parent 4a517d1 commit 14bdfec

File tree

1 file changed

+29
-13
lines changed

1 file changed

+29
-13
lines changed

.travis.yml

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ language: c++
55
dist: bionic
66

77
env:
8-
global: DEPS_DIR="${TRAVIS_BUILD_DIR}/deps_"
8+
global:
9+
- DEPS_DIR="${TRAVIS_BUILD_DIR}/deps_"
10+
- INSTALL_DIR="${TRAVIS_BUILD_DIR}/install"
911

1012
matrix:
1113
include:
@@ -53,9 +55,10 @@ matrix:
5355
# - os: osx
5456
# osx_image: xcode10
5557
# compiler: clang
56-
# env: [COMPILER='clang', VCPKG_TRIPLET='x64-osx']
58+
# env: [COMPILER='clang', VCPKG_TRIPLET='x64-osx', BUILD_WITH_LLVM_LIBCXX='ON']
5759

5860
before_install:
61+
- echo ${DEPS_DIR}
5962
- mkdir -p ${DEPS_DIR}
6063
- pushd ${DEPS_DIR}
6164
- echo ${TRAVIS_OS_NAME}
@@ -67,7 +70,15 @@ before_install:
6770
elif [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
6871
which cmake || brew install cmake
6972
fi
73+
- |
74+
if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
75+
which ninja || sudo apt-get install ninja-build
76+
elif [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
77+
which ninja || brew install ninja
78+
fi
7079
- popd
80+
- echo ${INSTALL_DIR}
81+
- mkdir -p ${INSTALL_DIR}
7182
- |
7283
if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
7384
brew install gcc
@@ -98,19 +109,24 @@ cache:
98109

99110
before_script:
100111
- export CXX=${COMPILER}
112+
- mkdir _build
113+
- cmake
114+
-B_build
115+
-GNinja
116+
-DSkyr_BUILD_TESTS=ON
117+
-DSkyr_BUILD_DOCS=OFF
118+
-DSkyr_BUILD_EXAMPLES=OFF
119+
-DSkyr_BUILD_WITH_LLVM_LIBCXX=${BUILD_WITH_LLVM_LIBCXX}
120+
-DCMAKE_TOOLCHAIN_FILE=${DEPS_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake
121+
-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
122+
.
101123

102124
script:
103-
- mkdir _build
104-
- pushd _build
105-
- cmake -DSkyr_BUILD_TESTS=ON
106-
-DSkyr_BUILD_DOCS=OFF
107-
-DSkyr_BUILD_EXAMPLES=OFF
108-
-DSkyr_BUILD_WITH_LLVM_LIBCXX=${BUILD_WITH_LLVM_LIBCXX}
109-
-DCMAKE_TOOLCHAIN_FILE=${DEPS_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake
110-
..
111-
- make -j 8
112-
- make test
113-
- popd
125+
- pushd _build
126+
- ninja
127+
- ninja test
128+
- ninja install
129+
- popd
114130

115131
after_failure:
116132
- cat _build/Testing/Temporary/LastTest.log

0 commit comments

Comments
 (0)