Skip to content

Commit 8784ff5

Browse files
committed
Forward BUILD_TYPE env var from Travis to Docker
1 parent b29a155 commit 8784ff5

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ services: docker
66
before_install:
77
- docker pull simverge/pdalc-build-deps:alpine
88

9-
#env:
10-
# - BUILD_TYPE=Release
11-
# - BUILD_TYPE=Debug
9+
env:
10+
- BUILD_TYPE=Release
11+
- BUILD_TYPE=Debug
1212

1313
script:
1414
- chmod u+x $TRAVIS_BUILD_DIR/tests/travis/script.sh
15-
- docker run -e TRAVIS_BRANCH -v $TRAVIS_BUILD_DIR:/pdalc -t simverge/pdalc-build-deps:alpine /pdalc/tests/travis/script.sh
15+
- docker run -e TRAVIS_BRANCH -e BUILD_TYPE -v $TRAVIS_BUILD_DIR:/pdalc -t simverge/pdalc-build-deps:alpine /pdalc/tests/travis/script.sh

tests/travis/script.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ g++ --version
55

66
export CI_PROJECT_DIR=/pdalc
77
export CI_PROJECT_NAME=pdal-c
8-
export BUILD_TYPE=Release
9-
uname -p
10-
8+
uname -m
119
export TARGET_PLATFORM=`uname`-$BUILD_TYPE
1210
echo "Building $CI_PROJECT_NAME ($TRAVIS_BRANCH branch) for $TARGET_PLATFORM"
1311
rm -rf "$CI_PROJECT_DIR/build/$TARGET_PLATFORM"

0 commit comments

Comments
 (0)