enabling documentation build for release

wrench-project · Nov 7, 2018 · 23f1cd5 · 23f1cd5
1 parent 4480f43
commit 23f1cd5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -62,13 +62,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
@@ -14,7 +14,7 @@ set(CMAKE_CXX_STANDARD 11)
 set(WRENCH_VERSION_MAJOR "1")
 set(WRENCH_VERSION_MINOR "2")
 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}")