diff --git a/CHANGELOG.md b/CHANGELOG.md index 49f16a6a3dd7a0bf647799df4482584f0d6b5f79..9355a943f8fb79b08f9127c11873990550a120ea 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 7c9899c9478bb3a204a5a110dd4ab48587ddf8da..84048413b7a10e7baefae843c8916b1906bc4da3 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 6114a2ed9b495ef7427a9bcabdd810c4313d3203..1c65e739b1ca0a5b5d43b54b975699a89c561067 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 88028017bbf1d60b4ee4928203c231de493413be..05753d944d6b6285c319469805cd8ad806f7341a 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;