From 12ef5f4719adb503b6197ef0c112ad3c97bfec75 Mon Sep 17 00:00:00 2001 From: Rafael Ferreira da Silva Date: Sun, 26 Aug 2018 18:46:36 -0700 Subject: [PATCH] preparing for release --- .travis.yml | 14 +++++++------- CMakeLists.txt | 2 +- include/wrench/simulation/Version.h | 2 +- sonar-project.properties | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4ff923585a..8262c9ea3a 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 a4995d78de..7484ccbecb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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}") diff --git a/include/wrench/simulation/Version.h b/include/wrench/simulation/Version.h index 883218346c..ee4bbf6ecd 100644 --- a/include/wrench/simulation/Version.h +++ b/include/wrench/simulation/Version.h @@ -9,5 +9,5 @@ */ namespace wrench { - #define WRENCH_VERSION_STRING "1.1-dev" + #define WRENCH_VERSION_STRING "1.1" } diff --git a/sonar-project.properties b/sonar-project.properties index 31e2cd390b..f9d0b4ad3c 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -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