Skip to content

Commit

Permalink
preparing for release
Browse files Browse the repository at this point in the history
  • Loading branch information
rafaelfsilva committed Aug 27, 2018
1 parent 2443861 commit 12ef5f4
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 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
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ set(CMAKE_CXX_STANDARD 11)
set(WRENCH_VERSION_MAJOR "1")
set(WRENCH_VERSION_MINOR "1")
set(WRENCH_VERSION_PATCH "0")
set(WRENCH_VERSION_EXTRA "dev")
set(WRENCH_VERSION_EXTRA "")

if (${WRENCH_VERSION_PATCH} EQUAL "0")
set(WRENCH_RELEASE_VERSION "${WRENCH_VERSION_MAJOR}.${WRENCH_VERSION_MINOR}")
Expand Down
2 changes: 1 addition & 1 deletion include/wrench/simulation/Version.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
*/

namespace wrench {
#define WRENCH_VERSION_STRING "1.1-dev"
#define WRENCH_VERSION_STRING "1.1"
}
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-dev
sonar.projectVersion=1.1

sonar.links.homepage=http://wrench-project.org
sonar.links.ci=https://travis-ci.org/wrench-project/wrench
Expand Down

0 comments on commit 12ef5f4

Please sign in to comment.