1
0
mirror of https://github.com/aportelli/LatAnalyze.git synced 2024-11-10 00:45:36 +00:00

CI scripts update

This commit is contained in:
Antonin Portelli 2019-04-26 17:36:44 +01:00
parent e44460c9fd
commit eb73d2f269
7 changed files with 9 additions and 13 deletions

View File

@ -21,7 +21,6 @@ matrix:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
packages: packages:
- g++-7 - g++-7
- libgsl0-dev
- flex - flex
- bison - bison
env: VERSION=-7 env: VERSION=-7
@ -32,7 +31,6 @@ matrix:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
packages: packages:
- g++-7 - g++-7
- libgsl0-dev
- flex - flex
- bison - bison
env: CLANG_LINK=http://releases.llvm.org/7.0.1/clang+llvm-7.0.1-x86_64-linux-gnu-ubuntu-14.04.tar.xz env: CLANG_LINK=http://releases.llvm.org/7.0.1/clang+llvm-7.0.1-x86_64-linux-gnu-ubuntu-14.04.tar.xz
@ -44,7 +42,6 @@ before_install:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CC" == "clang" ]]; then export PATH="${LATDIR}/ci-scripts/clang/bin:${PATH}"; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CC" == "clang" ]]; then export PATH="${LATDIR}/ci-scripts/clang/bin:${PATH}"; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CC" == "clang" ]]; then export LD_LIBRARY_PATH="${LATDIR}/ci-scripts/clang/lib:${LD_LIBRARY_PATH}"; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CC" == "clang" ]]; then export LD_LIBRARY_PATH="${LATDIR}/ci-scripts/clang/lib:${LD_LIBRARY_PATH}"; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install gsl; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install bison flex; export PATH="/usr/local/opt/flex/bin:/usr/local/opt/bison/bin:$PATH"; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install bison flex; export PATH="/usr/local/opt/flex/bin:/usr/local/opt/bison/bin:$PATH"; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$CC" == "gcc" ]]; then brew install gcc@${VERSION#-}; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$CC" == "gcc" ]]; then brew install gcc@${VERSION#-}; fi
@ -63,4 +60,4 @@ install:
script: script:
- cd ci-scripts - cd ci-scripts
- ./install-latan.sh `pwd`/local $TRAVIS_OS_NAME - ./install-latan.sh `pwd`/local

View File

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
if (( $# != 1 )); then if (( $# != 1 )); then
echo "usage: `basename $0` <prefix> {osx|linux}" 1>&2 echo "usage: `basename $0` <prefix>" 1>&2
exit 1 exit 1
fi fi
PREFIX=$1 PREFIX=$1

View File

@ -3,7 +3,7 @@
NAME='gsl-2.5' NAME='gsl-2.5'
if (( $# != 1 )); then if (( $# != 1 )); then
echo "usage: `basename $0` <prefix> {osx|linux}" 1>&2 echo "usage: `basename $0` <prefix>" 1>&2
exit 1 exit 1
fi fi
PREFIX=$1 PREFIX=$1

View File

@ -3,7 +3,7 @@
NAME='hdf5-1.10.1' NAME='hdf5-1.10.1'
if (( $# != 1 )); then if (( $# != 1 )); then
echo "usage: `basename $0` <prefix> {osx|linux}" 1>&2 echo "usage: `basename $0` <prefix>" 1>&2
exit 1 exit 1
fi fi
PREFIX=$1 PREFIX=$1

View File

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
if (( $# != 2 )); then if (( $# != 1 )); then
echo "usage: `basename $0` <prefix> {osx|linux}" 1>&2 echo "usage: `basename $0` <prefix>" 1>&2
exit 1 exit 1
fi fi
PREFIX=$1 PREFIX=$1
@ -13,7 +13,6 @@ cd ..
./bootstrap.sh ./bootstrap.sh
mkdir -p build mkdir -p build
cd build cd build
if [[ "$OS" == "osx" ]]; then EXTRA_FLAGS='--with-gsl=/usr/local'; fi ../configure --prefix=$PREFIX --with-minuit=$PREFIX --with-nlopt=$PREFIX --with-latcore=$PREFIX --with-hdf5=$PREFIX --with-gsl=$PREFIX CXXFLAGS="${CXXFLAGS} -O3 -march=native -mtune=native"
../configure --prefix=$PREFIX --with-minuit=$PREFIX --with-nlopt=$PREFIX --with-latcore=$PREFIX --with-hdf5=$PREFIX $EXTRA_FLAGS CXXFLAGS="${CXXFLAGS} -O3 -march=native -mtune=native"
make -j4 make -j4
make install make install

View File

@ -3,7 +3,7 @@
NAME='Minuit2-5.34.14' NAME='Minuit2-5.34.14'
if (( $# != 1 )); then if (( $# != 1 )); then
echo "usage: `basename $0` <prefix> {osx|linux}" 1>&2 echo "usage: `basename $0` <prefix>" 1>&2
exit 1 exit 1
fi fi
PREFIX=$1 PREFIX=$1

View File

@ -3,7 +3,7 @@
NAME='nlopt-2.4.2' NAME='nlopt-2.4.2'
if (( $# != 1 )); then if (( $# != 1 )); then
echo "usage: `basename $0` <prefix> {osx|linux}" 1>&2 echo "usage: `basename $0` <prefix>" 1>&2
exit 1 exit 1
fi fi
PREFIX=$1 PREFIX=$1