preparing repo for release 1.4

wrench-project · Apr 22, 2019 · a9adeee · a9adeee
1 parent 4d54e53
commit a9adeee
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -62,14 +62,14 @@ after_success:
   - docker rm wrench;
   - docker rmi wrenchproject/wrench-build:${DIST}-${COMPILER};
 
-#deploy:
-#  provider: pages
-#  skip_cleanup: true
-#  keep-history: true
-#  github_token: $GITHUB_TOKEN
-#  local_dir: ./docs/gh-pages
-#  on:
-#    branch: master
+deploy:
+  provider: pages
+  skip_cleanup: true
+  keep-history: 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 "4")
 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/RELEASENOTES.md b/RELEASENOTES.md
@@ -1,6 +1,19 @@
 WRENCH Release Notes
 ------
 
+### WRENCH 1.4
+
+(Apr 22, 2019) This release includes a series of new features and bug fixes, including:
+
+- Updated [Batsched](https://gitlab.inria.fr/batsim/batsched) support (support to new JSON-based protocol)
+- Dump `pstate` and energy consumption data as JSON
+- Adding support for `bytesRead`, `bytesWritten`, and `avgCPU` for workflows defined as JSON
+- Adding `ComputeService::getTotalNumCores()` and `ComputeService::getTotalNumIdleCores()` 
+- `wrench::BatchService` should handle requested vs. real job run times when replaying traces
+- Bug fixes: [#97](https://github.com/wrench-project/wrench/issues/97), [#99](https://github.com/wrench-project/wrench/issues/99), [#100](https://github.com/wrench-project/wrench/issues/100)
+
+**Note**: WRENCH 1.4 requires [SimGrid 3.21](https://simgrid.org).
+
 ### WRENCH 1.3
 
 (_Jan 3, 2019_) This release includes a series of new features and bug fixes, including:
@@ -9,9 +22,9 @@ WRENCH Release Notes
 - `MultiHostMultiCoreComputeService` re-implemented as `BareMetalComputeService`
 - Documentation of the JSON schema for workflows
 - Documentation Guide containing detailed descriptions of WRENCH core services
-- Bug fixes: #81
+- Bug fixes: [#81](https://github.com/wrench-project/wrench/issues/81)
 
-**Note**: WRENCH 1.2 requires [SimGrid 3.21](https://simgrid.org).
+**Note**: WRENCH 1.3 requires [SimGrid 3.21](https://simgrid.org).
 
 ### WRENCH 1.2
 

diff --git a/include/wrench/simulation/Version.h b/include/wrench/simulation/Version.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017-2018. The WRENCH Team.
+ * Copyright (c) 2017-2019. The WRENCH Team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -9,5 +9,5 @@
  */
 
 namespace wrench {
-  #define WRENCH_VERSION_STRING "1.4-dev"
+  #define WRENCH_VERSION_STRING "1.4"
 }
diff --git a/include/wrench/simulation/Version.h.in b/include/wrench/simulation/Version.h.in
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017-2018. The WRENCH Team.
+ * Copyright (c) 2017-2019. The WRENCH Team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/sonar-project.properties b/sonar-project.properties
@@ -1,6 +1,6 @@
 sonar.projectKey=wrench
 sonar.projectName=WRENCH
-sonar.projectVersion=1.4-dev
+sonar.projectVersion=1.4
 
 sonar.links.homepage=http://wrench-project.org
 sonar.links.ci=https://travis-ci.org/wrench-project/wrench