From 5af9bd63dcd7c5e8ab3ee72766e8df5a432cc7a6 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Tue, 27 Aug 2019 09:35:25 -0600 Subject: [PATCH 1/2] Updating version number corresponding to bug in njoy_c_bindings. --- src/njoy21/Version.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/njoy21/Version.hpp b/src/njoy21/Version.hpp index 5771522a..dd0a2cd7 100644 --- a/src/njoy21/Version.hpp +++ b/src/njoy21/Version.hpp @@ -4,7 +4,7 @@ class Version{ // Change whenever new capability is implemented static constexpr int minorVersion{0}; // Change whenever merge to master branch is done - static constexpr int patchVersion{4}; + static constexpr int patchVersion{5}; static std::string version(){ return std::to_string( majorVersion ) + "." + From cd9726c3f6fe83528cebbb4cab3ad3f661a5ec4f Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Tue, 27 Aug 2019 09:45:21 -0600 Subject: [PATCH 2/2] Updating Travis-ci configuration again. --- .travis.yml | 3 +- .travis/build.sh | 60 ------------------------------------ dependencies/njoy_c_bindings | 2 +- 3 files changed, 2 insertions(+), 63 deletions(-) delete mode 100755 .travis/build.sh diff --git a/.travis.yml b/.travis.yml index c155920e..f3f62ced 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,7 @@ language: cpp script: "./.travis/signature.sh" branches: - except: - - gh-pages + - master env: global: diff --git a/.travis/build.sh b/.travis/build.sh deleted file mode 100755 index 6a4e9540..00000000 --- a/.travis/build.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/bash -set -x - -if [ "$TRAVIS_OS_NAME" = "linux" ]; then - sudo update-alternatives \ - --install /usr/bin/gcc gcc /usr/bin/gcc-6 90 \ - --slave /usr/bin/g++ g++ /usr/bin/g++-6 \ - --slave /usr/bin/gfortran gfortran /usr/bin/gfortran-6 \ - --slave /usr/bin/gcov gcov /usr/bin/gcov-6 - sudo update-alternatives \ - --install /usr/bin/clang clang /usr/bin/clang-3.8 90 \ - --slave /usr/bin/clang++ clang++ /usr/bin/clang++-3.8 - sudo update-alternatives --config gcc - sudo update-alternatives --config clang - if [ "$CXX" = "clang++" ]; then - export PATH=/usr/bin:$PATH - export CUSTOM='-D link_time_optimization=OFF' - else - export CUSTOM='-D link_time_optimization=ON -D CMAKE_AR=/usr/bin/gcc-ar -D CMAKE_NM=/usr/bin/gcc-nm -D CMAKE_RANLIB=/usr/bin/gcc-ranlib' - fi; - export NPROC=$(nproc) -else - export NPROC=$(sysctl -n hw.physicalcpu) -fi - -if [ "$build_type" = "coverage" ]; then - export build_type=DEBUG - export coverage=true - export CUSTOM="$CUSTOM -D coverage=ON" -else - export coverage=false -fi; - -mkdir build -cd build - -cmake -D CMAKE_BUILD_TYPE=$build_type \ - -D static_libraries=$static_libraries \ - -D njoy21_appended_flags="$appended_flags" \ - $CUSTOM .. -make VERBOSE=1 -j$NPROC -export COMPILATION_FAILURE=$? - -if [ $COMPILATION_FAILURE -ne 0 ]; -then - exit 1 -fi - -ctest --output-on-failure -j$NPROC -export TEST_FAILURE=$? -if [ $TEST_FAILURE -ne 0 ]; -then - exit 1 -fi - -if $coverage; then - pip install --user cpp-coveralls - echo "loading coverage information" - coveralls --exclude-pattern "/usr/include/.*|.*/CMakeFiles/.*|.*subprojects.*|.*dependencies.*|.*test\.cpp" --root ".." --build-root "." --gcov-options '\-lp' -fi diff --git a/dependencies/njoy_c_bindings b/dependencies/njoy_c_bindings index 5fafd996..487beb0e 160000 --- a/dependencies/njoy_c_bindings +++ b/dependencies/njoy_c_bindings @@ -1 +1 @@ -Subproject commit 5fafd9966c78fa567865f584f1bd9f7bc3abffe9 +Subproject commit 487beb0e84cce62ff1b4c0864a000ff7c1f7f5d3