Skip to content

Commit 503098b

Browse files
committed
Merge pull request #582 from JLLeitschuh/build/osxTravisBuild
Add OSX Build on Travis
2 parents 9f1fa2b + 6c11d42 commit 503098b

File tree

3 files changed

+23
-11
lines changed

3 files changed

+23
-11
lines changed

.travis-scripts/install.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/bash
2+
3+
if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
4+
5+
# Install some custom requirements on OS X
6+
wget --no-cookies --no-check-certificate --header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/8u66-b17/jdk-8u66-macosx-x64.dmg
7+
hdiutil mount jdk-8u66-macosx-x64.dmg
8+
sudo installer -pkg /Volumes/JDK\ 8\ Update\ 66/JDK\ 8\ Update\ 66.pkg -target LocalSystem
9+
else
10+
export DISPLAY=:99.0
11+
sh -e /etc/init.d/xvfb start
12+
pip install --user codecov
13+
fi

.travis-scripts/push-javadoc-to-gh-pages.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
# Source of file: http://benlimmer.com/2013/12/26/automatically-publish-javadoc-to-gh-pages-with-travis-ci/
4-
if [ "$TRAVIS_REPO_SLUG" == "WPIRoboticsProjects/GRIP" ] && [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then
4+
if [ "$TRAVIS_REPO_SLUG" == "WPIRoboticsProjects/GRIP" ] && [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ] && [[ "$TRAVIS_OS_NAME" != "osx" ]]; then
55

66
echo -e "Generating javadoc...\n"
77
./gradlew aggregateJavadocs

.travis.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
# NOTE: Don't use `sudo` anywhere or the build will run on Travis's slower, outdated build system
22
language: java
3-
jdk:
4-
- oraclejdk8
3+
4+
matrix:
5+
include:
6+
- os: linux
7+
jdk: oraclejdk8
8+
- os: osx
59

610
# GCC needs to be 4.8 or higher so that GOMP_4.0 is installed for opencv
711
# This is incredibly hard to track down, find the solution for and fix.
@@ -17,9 +21,7 @@ addons:
1721
- oracle-java8-installer
1822

1923
before_install:
20-
- export DISPLAY=:99.0
21-
- sh -e /etc/init.d/xvfb start
22-
- pip install --user codecov
24+
- .travis-scripts/install.sh
2325

2426
# Only do an assemble when we aren't building a pull request
2527
install:
@@ -29,7 +31,7 @@ script:
2931
- ./gradlew check --stacktrace -Pheadless=true
3032

3133
after_success:
32-
- codecov
34+
- if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then codecov ; fi
3335
- .travis-scripts/push-javadoc-to-gh-pages.sh
3436
- .travis-scripts/before-deploy.sh
3537

@@ -47,15 +49,12 @@ env:
4749
global:
4850
secure: f90qqcA5inkHmYUK6WNITkSPbalpw+r+6nzykPdN30ahB8OUupYxoJxFknxw74raPQ69IgsDF+f8RihEBNIjH8TiMihkcwbkUGGfYaON+sVdvV/GgRQcUk0tm/wrWxRiB1qOYfsvU4sdyvFWBtAbeuhBH1JMLlQGaFjHTJOUwCjm3iEW0CKC9btsgcZIvIrHkP2KNHUMD2iBs6BJ4W448ElQTBBnaoInWUm/ecV+nNUX9yT1CpVWABVuioUkSWSm7eMiqYnvm4J9+LUh8+IMYyodO2hjPWlQ18yhmP9kSlGpQT6pRZjCRd394GE8plKxxWwp9CVXyUY/KQiYoNMRQaAiwuNnXrCi2Et1Fp8+MzQjpl+2CWbdtPwqGhKrGICfhPHvswNE2jM7VLAu/8Gn+ubhKuYfiibska5tXDBknrVbOiV1s9h3y3hI2WyyUg+T1ZsirhGVzMSmDk4HZnLUf7uEEMZEMQzLC0yk495TTZ2zihRnAkOXhNd24lHVwns2WSu0BKvawaDlfQinCbddKGNXE0cdkDvO9xk4IsbioRJ3w8DhBdL4HAEw/Gzx5N3xEVXgOAtwoP+zH2b3LIXQvP5pkuyna48R9L7Fc+EXUmejuRUmjQQMbsdLbx6Ci8gnd6Xq7CYvwry6t3R0GKuCwziuZNl44doHYR6MK7CDBWo=
4951

50-
os:
51-
- linux
52-
5352
deploy:
5453
provider: releases
5554
api_key:
5655
secure: bdjiFXG3VBcM1iyxeputsWA9vHxgLNcxRB1i0REDNAnIEvDWpAdVr1jPBejeiOEw9s+k6EItATvQ2I7Xp5iKnYaXn0NuHzM3OSY8WNVCc+gBTaQwkijPBqi/vEXaO502CscW+H2U26QZGS/jJiUuieeErtzCNcWmCv8SRc5NFOVYdSlhAmp+aPeu2YwuweiMZNVquYM2hx7murghOYSF5hQTKq4/zrziENVi78XZS8rJFmxwOGqNj1GBLul2F9poIPjzDbPVJLeXTJEY+N3aYGJ4GyZYf6p8ynDO/v043/GuOAyNfkgSwhCcTQlmLG/mm6P9CUMoDQR9klh2eDswgrIP4rGLwILg3035nqHqwgTIKVXfspni3P/65siS6lXV0M5flEkRysMBr1GQhaIEUM32ArreMzAtC2Vn2CviKG0TwLmxyd/7W3JdoX4KrHAcKBwbqFDImWw43S6N63oTUEw6GjrI+CndwgF9RNgr5SAyS28LFXViOJe7JlGVUNU33kMNpEJxzVREzkJsO8aicaZTrvDniFOfg2WhrAyhjxmh4/IOHDE6qgtxw+2+TUzMlwdzdxb90BeXg2XfMichmKfQYQFEmZntCZcoHHDG5jbCTyAvFuOv6tdPjpr69QjiEJhEbohw8CEwoGhy1kxxQcCDCfABrOTivJ39Ui8MC6k=
5756
file_glob: true
58-
file: "ui/build/distributions/*.deb"
57+
file: "ui/build/distributions/*.{deb,pkg,dmg}"
5958
skip_cleanup: true
6059
on:
6160
repo: WPIRoboticsProjects/GRIP

0 commit comments

Comments
 (0)