Skip to content

Commit 51dcc50

Browse files
committed
Add ubuntu to Travis CI build matrix
1 parent 8784ff5 commit 51dcc50

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

.travis.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@ sudo: required
33
language: minimal
44
services: docker
55

6-
before_install:
7-
- docker pull simverge/pdalc-build-deps:alpine
8-
96
env:
10-
- BUILD_TYPE=Release
11-
- BUILD_TYPE=Debug
7+
- DISTRO=alpine BUILD_TYPE=Release
8+
- DISTRO=alpine BUILD_TYPE=Debug
9+
- DISTRO=ubuntu BUILD_TYPE=Release
10+
- DISTRO=ubuntu BUILD_TYPE=Debug
11+
12+
before_install:
13+
- docker pull simverge/pdalc-build-deps:$DISTRO
1214

1315
script:
1416
- chmod u+x $TRAVIS_BUILD_DIR/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
17+
- docker run -e TRAVIS_BRANCH -e BUILD_TYPE -e DISTRO -v $TRAVIS_BUILD_DIR:/pdalc -t simverge/pdalc-build-deps:$DISTRO /pdalc/tests/travis/script.sh

tests/travis/script.sh

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

66
export CI_PROJECT_DIR=/pdalc
77
export CI_PROJECT_NAME=pdal-c
8-
uname -m
9-
export TARGET_PLATFORM=`uname`-$BUILD_TYPE
8+
export TARGET_PLATFORM=$DISTRO-`uname -m`-$BUILD_TYPE
109
echo "Building $CI_PROJECT_NAME ($TRAVIS_BRANCH branch) for $TARGET_PLATFORM"
1110
rm -rf "$CI_PROJECT_DIR/build/$TARGET_PLATFORM"
1211
mkdir -p "$CI_PROJECT_DIR/build/$TARGET_PLATFORM"

0 commit comments

Comments
 (0)