Unverified Commit 316d4bec authored by Spencer Salazar's avatar Spencer Salazar Committed by GitHub
Browse files

first pass: Travis integration (#75)

* travis test

* add master branch

* travis fixes

* travis update

* travis update

* travis update

* travis update

* travis update

* travis update

* travis update

* travis update

* travis update

* travis update

* travis update

* travis update

* travis update

* add atomic header

* travis update

* travis update

* travis update

* travis update

* travis update

* travis update

* travis update

* travis update

* remove unnecessary change

* remove unnecessary change

* Update .travis.yml
parent eada1387
os:
- linux
- osx
language:
- cpp
# force updated ubuntu distribution with up-to-date gcc
dist: bionic
branches:
- master
env:
global:
- PKGS_OSX="jack qt rt-audio"
addons:
apt:
update: true
packages:
- qt5-default
- qttools5-dev-tools
- libjack-dev
- librtaudio-dev
before_script:
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then
# manually install brew packages as addon: homebrew is broken in the default osx image
brew install $PKGS_OSX;
# mac: workaround for homebrew qmake not being symlinked into $PATH
# see https://stackoverflow.com/questions/48847505/why-cant-i-use-qmake-on-mac-after-installing-it
export PATH="/usr/local/opt/qt/bin:$PATH";
fi
script:
- cd src
- ./build
after_success:
- echo "Success!"
after_failure:
- echo "Something went wrong :("
......@@ -44,6 +44,8 @@
#include "jacktrip_types.h"
#include <atomic>
//using namespace JackTripNamespace;
......
......@@ -17,9 +17,6 @@ if [[ $platform == 'linux' ]]; then
if hash qmake-qt5 2>/dev/null; then
echo "Using qmake-qt5"
QCMD=qmake-qt5
elif hash qmake-qt4 2>/dev/null; then
echo "Using qmake-qt4"
QCMD=qmake-qt4
elif hash qmake 2>/dev/null; then #in case qt was compiled by user
echo "Using qmake"
QCMD=qmake
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment