Skip to content

Commit ee57091

Browse files
authored
Update RB-1.1 CI builds to resolve failure cases (#679)
* Update CI builds to resolve failure cases * Incompatible boost path for VS2015 * Incomplete python env for OSX (xcode) * Adopt latest travis OSX configuration
1 parent bc40c8a commit ee57091

File tree

2 files changed

+26
-7
lines changed

2 files changed

+26
-7
lines changed

.appveyor.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@ platform:
88
- x64
99

1010
environment:
11-
global:
12-
CMAKE_PREFIX_PATH: C:/Libraries/boost
13-
BOOST_ROOT: 'C:\Libraries\boost'
1411
matrix:
1512
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
1613
CMAKE_PLATFORM: "Visual Studio 12 2013 Win64"
14+
CMAKE_PREFIX_PATH: C:/Libraries/boost
15+
BOOST_ROOT: 'C:\Libraries\boost'
1716
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
1817
CMAKE_PLATFORM: "Visual Studio 14 2015 Win64"
18+
CMAKE_PREFIX_PATH: C:/Libraries/boost_1_60_0
19+
BOOST_ROOT: 'C:\Libraries\boost_1_60_0'
1920

2021
install:
2122
- cinstall: python

.travis.yml

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,27 @@ env:
2424
- OPTIONS="-DCMAKE_BUILD_TYPE=Release -DOCIO_BUILD_TESTS=yes -DOCIO_BUILD_DOCS=yes"
2525

2626
# Install missing packages
27-
install:
28-
- if [[ $TRAVIS_OS_NAME = linux ]]; then sudo apt-get update -qq; fi
29-
- if [[ $TRAVIS_OS_NAME = linux ]]; then sudo apt-get install -qq texlive-full; fi
27+
before_install:
28+
# Linux ones
29+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
30+
sudo apt-get update -qq;
31+
sudo apt-get install -y -qq texlive-full;
32+
fi
33+
# OSX ones
34+
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
35+
brew update;
36+
brew install glew;
37+
brew upgrade cmake;
38+
brew upgrade pyenv;
39+
echo 'eval "$(pyenv init -)"' >> .bash_profile;
40+
source .bash_profile;
41+
export PYTHON_CONFIGURE_OPTS="--enable-framework";
42+
pyenv install -v 2.7.15;
43+
pyenv global 2.7.15;
44+
export OPTIONS="$OPTIONS -DPYTHON_LIBRARY=$(python-config --prefix)/lib/libpython2.7.dylib";
45+
export OPTIONS="$OPTIONS -DPYTHON_INCLUDE_DIR=$(python-config --prefix)/include/python2.7";
46+
export OPTIONS="$OPTIONS -DPYTHON_EXECUTABLE=$(which python2)";
47+
fi
3048

3149
# Run the Build script
3250
script:
@@ -35,7 +53,7 @@ script:
3553
- cmake .. -DCMAKE_INSTALL_PREFIX=../_install $OPTIONS
3654
- cmake --build . --target install
3755
- ctest --output-on-failure .
38-
- if [[ $TRAVIS_OS_NAME = linux ]]; then cmake --build . --target pdf; fi
56+
- if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then cmake --build . --target pdf; fi
3957

4058
deploy:
4159
provider: pages

0 commit comments

Comments
 (0)