From 9b3c4ccfce62a5c56b6e8903d921a531d12cbadb Mon Sep 17 00:00:00 2001
From: Millian Poquet <millian.poquet@inria.fr>
Date: Tue, 15 Jan 2019 21:07:39 +0100
Subject: [PATCH] [misc] bump version 1.3.0
---
CHANGELOG.md | 9 +++++++--
CMakeLists.txt | 2 +-
ci/local.nix | 2 +-
default.nix | 2 +-
4 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 49f16a6..9355a94 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,9 @@ Batsched adheres to [Semantic Versioning][semver] and its public API is the foll
[//]: =========================================================================
## [Unreleased]
+
+[//]: =========================================================================
+## [1.3.0] - 2019-01-15 - For [Batsim v3.0.0][Batsim v3.0.0]
### Added
- CLI: logging verbosity can now be set with `--verbosity`.
@@ -82,9 +85,11 @@ Initial release.
[taywee/args]: https://github.com/Taywee/args
[boost::po]: http://www.boost.org/doc/libs/1_66_0/doc/html/program_options.html
-[Batsim v2.0.0]: https://github.com/oar-team/batsim/blob/master/doc/changelog.md#200---2018-02-20
+[Batsim v2.0.0]: https://batsim.readthedocs.io/en/latest/changelog.html#v2-0-0
+[Batsim v3.0.0]: https://batsim.readthedocs.io/en/latest/changelog.html#v3-0-0
-[Unreleased]: https://gitlab.inria.fr/batsim/batsched/compare/v1.2.1...master
+[Unreleased]: https://gitlab.inria.fr/batsim/batsched/compare/v1.3.0...master
+[1.3.0]: https://gitlab.inria.fr/batsim/batsched/compare/v1.2.1...v1.3.0
[1.2.1]: https://gitlab.inria.fr/batsim/batsched/compare/v1.2.0...v1.2.1
[1.2.0]: https://gitlab.inria.fr/batsim/batsched/compare/v1.1.0...v1.2.0
[1.1.0]: https://gitlab.inria.fr/batsim/batsched/compare/v1.0.0...v1.1.0
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c9899c..8404841 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,7 +122,7 @@ endif()
####################
# Batsched version #
####################
-set(default_batsched_version "v1.2.1")
+set(default_batsched_version "v1.3.0")
include(GetGitRevisionDescription)
git_describe(batsched_version)
message(STATUS "Batsched version from git: ${batsched_version}")
diff --git a/ci/local.nix b/ci/local.nix
index 6114a2e..1c65e73 100644
--- a/ci/local.nix
+++ b/ci/local.nix
@@ -1,7 +1,7 @@
{ stdenv, batsched_dev }:
(batsched_dev.override {}).overrideAttrs (attrs: rec {
- name = "batsched-1.2.1-nix-ci";
+ name = "batsched-1.4.0-nix-ci";
src = stdenv.lib.sourceByRegex ../. [
"^src$"
"^src/algo$"
diff --git a/default.nix b/default.nix
index 8802801..05753d9 100644
--- a/default.nix
+++ b/default.nix
@@ -9,7 +9,7 @@ with kapack;
with pkgs;
(batsched_dev.override {}).overrideAttrs (attrs: rec {
- name = "batsched-1.2.1-nix-local";
+ name = "batsched-1.4.0-nix-local";
src = ../.;
enableParallelBuilding = true;
doCheck = false;
--
GitLab