Skip to content

Commit d861d3d

Browse files
committed
Add Mac OS build
1 parent 887d506 commit d861d3d

File tree

3 files changed

+62
-12
lines changed

3 files changed

+62
-12
lines changed

.travis.yml

Lines changed: 47 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,58 @@
11
sudo: false
2-
before_install:
3-
- docker pull daunnc/pdal:1.7.1
4-
language: scala
2+
3+
matrix:
4+
include:
5+
- os: linux
6+
jdk: oraclejdk8
7+
language: scala
8+
scala:
9+
- 2.11.12
10+
before_install:
11+
- docker pull daunnc/pdal:1.7.1
12+
services:
13+
- docker
14+
15+
- os: linux
16+
jdk: oraclejdk8
17+
language: scala
18+
scala:
19+
- 2.12.5
20+
before_install:
21+
- docker pull daunnc/pdal:1.7.1
22+
services:
23+
- docker
24+
25+
- os: osx
26+
scala:
27+
- 2.11.12
28+
compiler:
29+
- gcc
30+
- clang
31+
before_install:
32+
- brew update
33+
- brew install pdal || true # to make travis happy
34+
35+
- os: osx
36+
scala:
37+
- 2.12.5
38+
compiler:
39+
- gcc
40+
- clang
41+
before_install:
42+
- brew update
43+
- brew install pdal || true # to make travis happy
44+
545
addons:
646
hostname: localhost
7-
services:
8-
- docker
9-
jdk:
10-
- oraclejdk8
11-
scala:
12-
- 2.11.12
13-
- 2.12.5
47+
1448
cache:
1549
directories:
1650
- $HOME/.ivy2
1751
- $HOME/.sbt
52+
1853
script:
19-
- docker run -it --net=host -v $HOME/.ivy2:/root/.ivy2 -v $HOME/.sbt:/root/.sbt -v $TRAVIS_BUILD_DIR:/pdal-java -e TRAVIS_SCALA_VERSION=$TRAVIS_SCALA_VERSION -e TRAVIS_COMMIT=$TRAVIS_COMMIT -e TRAVIS_JDK_VERSION=$TRAVIS_JDK_VERSION daunnc/pdal:1.7.1 /bin/bash -c "cd /pdal-java; .travis/test-all.sh"
54+
- .travis/run.sh
55+
2056
notifications:
2157
email:
2258
recipients:

.travis/run.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/usr/bin/env bash
2+
3+
if [[ $TRAVIS_OS_NAME == "osx" ]]; then
4+
.travis/test-all.sh
5+
else
6+
docker run -it --net=host \
7+
-v $HOME/.ivy2:/root/.ivy2 \
8+
-v $HOME/.sbt:/root/.sbt \
9+
-v $TRAVIS_BUILD_DIR:/pdal-java \
10+
-e TRAVIS_SCALA_VERSION=$TRAVIS_SCALA_VERSION \
11+
-e TRAVIS_COMMIT=$TRAVIS_COMMIT \
12+
-e TRAVIS_JDK_VERSION=$TRAVIS_JDK_VERSION daunnc/pdal:1.7.1 /bin/bash -c "cd /pdal-java; .travis/test-all.sh"
13+
fi

build.sbt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,6 @@ lazy val core = project
7777
.dependsOn(Environment.dependOnNative(native % Runtime): _*)
7878

7979
lazy val native = project
80+
.settings(commonSettings.head)
8081
.settings(sourceDirectory in nativeCompile := sourceDirectory.value)
81-
.enablePlugins(JniNative)
82+
.enablePlugins(JniNative, JniPackage)

0 commit comments

Comments
 (0)