From 609eba716e35151bb5aab2646e9285214c26aee7 Mon Sep 17 00:00:00 2001 From: Rafael Ferreira da Silva Date: Tue, 14 Aug 2018 19:45:39 -0700 Subject: [PATCH] preparing for 1.0.1 release --- .travis.yml | 14 +++++++------- CMakeLists.txt | 10 +++++----- sonar-project.properties | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3fc43d4f9e..be0025d3f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,13 +63,13 @@ after_success: - docker rm wrench; - docker rmi wrenchproject/wrench-build:${DIST}-${COMPILER}; -#deploy: -# provider: pages -# skip_cleanup: true -# github_token: $GITHUB_TOKEN -# local_dir: ./docs/gh-pages -# on: -# branch: master +deploy: + provider: pages + skip_cleanup: true + github_token: $GITHUB_TOKEN + local_dir: ./docs/gh-pages + on: + branch: master notifications: email: diff --git a/CMakeLists.txt b/CMakeLists.txt index 1246126dc4..eeb48e6a3a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,20 +6,20 @@ project(wrench CXX) add_definitions("-Wall -Wno-unused-variable -Wno-unused-private-field") if (ENABLE_BATSCHED) add_definitions(-DENABLE_BATSCHED) -endif() +endif () set(CMAKE_CXX_STANDARD 11) # build the version number set(WRENCH_VERSION_MAJOR "1") set(WRENCH_VERSION_MINOR "0") -set(WRENCH_VERSION_PATCH "0") +set(WRENCH_VERSION_PATCH "1") set(WRENCH_VERSION_EXTRA "") if (${WRENCH_VERSION_PATCH} EQUAL "0") set(WRENCH_RELEASE_VERSION "${WRENCH_VERSION_MAJOR}.${WRENCH_VERSION_MINOR}") else () - set(WRENCH_RELEASE_VERSION "$(WRENCH_VERSION_MAJOR}.${WRENCH_VERSION_MINOR}.${WRENCH_VERSION_PATCH}") + set(WRENCH_RELEASE_VERSION "${WRENCH_VERSION_MAJOR}.${WRENCH_VERSION_MINOR}.${WRENCH_VERSION_PATCH}") endif () if (NOT ${WRENCH_VERSION_EXTRA} EQUAL "") @@ -273,9 +273,9 @@ install(DIRECTORY include/ DESTINATION include) add_executable(unit_tests EXCLUDE_FROM_ALL ${SOURCE_FILES} ${HEADER_FILES} ${TEST_FILES}) if (ENABLE_BATSCHED) target_link_libraries(unit_tests ${GTEST_LIBRARY} wrench -lpthread -lm -lzmq) -else() +else () target_link_libraries(unit_tests ${GTEST_LIBRARY} wrench -lpthread -lm) -endif() +endif () set_target_properties(unit_tests PROPERTIES COMPILE_FLAGS "-g -O0 --coverage") diff --git a/sonar-project.properties b/sonar-project.properties index b58312bf94..8044b3aab7 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,6 +1,6 @@ sonar.projectKey=wrench sonar.projectName=WRENCH -sonar.projectVersion=1.1 +sonar.projectVersion=1.0.1 sonar.links.homepage=http://wrench-project.org sonar.links.ci=https://travis-ci.org/wrench-project/wrench