Skip to content

Commit

Permalink
preparing for 1.0.1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
rafaelfsilva committed Aug 15, 2018
1 parent 9f0d988 commit 609eba7
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
14 changes: 7 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 "")
Expand Down Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion sonar-project.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 609eba7

Please sign in to comment.