Browse Source

Merge pull request #1 from binhonglee/Fixing-travis-yml

Fixed travis yml
master
BinHong Lee 7 years ago
committed by GitHub
parent
commit
bfdbc3bdbf
5 changed files with 43 additions and 18 deletions
  1. +28
    -4
      .travis.yml
  2. +8
    -2
      install.sh
  3. +0
    -5
      mac_install.sh
  4. +0
    -6
      mac_uninstall.sh
  5. +7
    -1
      uninstall.sh

+ 28
- 4
.travis.yml View File

@@ -1,6 +1,30 @@
sudo: required
language: cpp
before_install: sudo apt-get update
install: ./install.sh
script: ant test
after_script: ./uninstall.sh
matrix:
include:
# works on Precise and Trusty
- os: linux
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-6
env:
- MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"

- os: osx
osx_image: xcode8
env:
- MATRIX_EVAL="brew cask uninstall oclint && brew install gcc@6 && CC=gcc-6 && CXX=g++-6"

before_install:
- eval "${MATRIX_EVAL}"
install:
- ./install.sh
script:
- ant test
after_script:
- ./uninstall.sh
after_success:
- bash <(curl -s https://codecov.io/bash)

+ 8
- 2
install.sh View File

@@ -1,5 +1,11 @@
sudo apt-get update
sudo apt-get install libjsoncpp-dev
if [ $(uname) == "Darwin" ]; then
brew install ant
brew install jsoncpp
else
sudo apt-get update
sudo apt-get install libjsoncpp-dev
fi

cp lib/anttasks.jar ~
pushd ~
jar xf anttasks.jar


+ 0
- 5
mac_install.sh View File

@@ -1,5 +0,0 @@
brew install jsoncpp
cp lib/anttasks.jar ~
pushd ~
jar xf anttasks.jar
pushd -0

+ 0
- 6
mac_uninstall.sh View File

@@ -1,6 +0,0 @@
brew uninstall jsoncpp
cd ../
echo "Deleting project files"
rm -rf TicketingSystem
echo "Removing additional installed library"
rm -rf ~/anttasks.jar

+ 7
- 1
uninstall.sh View File

@@ -1,4 +1,10 @@
sudo apt-get remove --purge libjsoncpp-dev
if [ $(uname) == "Darwin" ]; then
brew uninstall jsoncpp
brew uninstall ant
else
sudo apt-get remove --purge libjsoncpp-dev
fi

cd ../
echo "Deleting project files"
rm -rf TicketingSystem


Loading…
Cancel
Save