From b37b5ecce130381a94e3f36a76e9b83e21250a3e Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 2 Feb 2020 16:30:05 +0100 Subject: [PATCH] Start the dev of 3.26 --- CMakeLists.txt | 2 +- ChangeLog | 5 +++++ NEWS | 7 +++++++ doc/doxygen/inside_release.doc | 5 +++-- docs/source/conf.py | 2 +- setup.py | 2 +- sonar-project.properties | 2 +- 7 files changed, 19 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e3031490bb..ff7ab6d54b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ set(SIMGRID_VERSION_MAJOR "3") set(SIMGRID_VERSION_MINOR "25") -set(SIMGRID_VERSION_PATCH "0") # odd => git branch; even => stable release or released snapshot +set(SIMGRID_VERSION_PATCH "1") # odd => git branch; even => stable release or released snapshot set(SIMGRID_VERSION_DATE "2020") # Year for copyright information diff --git a/ChangeLog b/ChangeLog index 868394e72d..6c8a529f28 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ ---------------------------------------------------------------------------- +SimGrid (3.25.1) UNRELEASED (target: March 20 2020 or v3.26 on 3/26/20) + + +---------------------------------------------------------------------------- + SimGrid (3.25) February 2. 2020 (aka 02 02 2020) The Palindrom Day Release. diff --git a/NEWS b/NEWS index 3e0f1fe43c..1e54108843 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,10 @@ + _ _____ ____ __ +__ _____ _ __ ___(_) ___ _ __ |___ / |___ \ / /_ +\ \ / / _ \ '__/ __| |/ _ \| '_ \ |_ \ __) | '_ \ + \ V / __/ | \__ \ | (_) | | | | ___) | / __/| (_) | + \_/ \___|_| |___/_|\___/|_| |_| |____(_)_____|\___/ + (unreleased) + _ _____ ____ ____ __ _____ _ __ ___(_) ___ _ __ |___ / |___ \| ___| \ \ / / _ \ '__/ __| |/ _ \| '_ \ |_ \ __) |___ \ diff --git a/doc/doxygen/inside_release.doc b/doc/doxygen/inside_release.doc index 33d1820fc8..409a58f45c 100644 --- a/doc/doxygen/inside_release.doc +++ b/doc/doxygen/inside_release.doc @@ -27,6 +27,7 @@ Please apply the following checklist before releasing. https://framagit.org/simgrid/simgrid-template-s4u/pipelines https://framagit.org/simgrid/external-projects-ci/pipelines - The python module builds (see below). + - You can have a simgrid.jar from jenkins/macosx + AppVeyor @subsection inside_release_c_releasing Actually releasing SimGrid @@ -36,9 +37,10 @@ Please apply the following checklist before releasing. - docs/source/conf.py - setup.py - Commit and push to both framagit and github -- Wait for both appveyor and jenkins/highsierra to complete the build +- Wait for both appveyor and jenkins/osX to complete the build - If it's not successful, fix it and push again - Once it's successful everywhere: merge 'master' into 'stable' and push it to framagit + - You can interrupt the build on jenkins, as it was tested just before - This builds the tar.gz and jar artefacts. The old doc says how to do manually if something goes wrong. - Do not merge into 'stable' before appveyor and jenkins are done, or your jarfile will not contain the code you expect for win and mac. @@ -52,7 +54,6 @@ Please apply the following checklist before releasing. - Add a link to the version of the ChangeLog that comes with this tag. - Update the website - emacs org/org-templates/level-0.org to change the release version, the tgz link and the jar link. - - make -C org all sync - jed .gitlab-ci.yml - Change the link to the SimGrid-doc-3_XX.zip file - Only keep 2 versions so that people don't find older ones in google diff --git a/docs/source/conf.py b/docs/source/conf.py index 965b6beb6b..b287522edd 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -36,7 +36,7 @@ copyright = u'2002-2020, The SimGrid Team' author = u'The SimGrid Team' # The short X.Y version -version = u'3.25.0' +version = u'3.25.1' # -- General configuration --------------------------------------------------- diff --git a/setup.py b/setup.py index c644c61d05..d5475b4c79 100755 --- a/setup.py +++ b/setup.py @@ -82,7 +82,7 @@ class CMakeBuild(build_ext): setup( name='simgrid', - version='3.25.0', + version='3.25.1', author='Da SimGrid Team', author_email='simgrid-devel@lists.gforge.inria.fr', description='Toolkit for scalable simulation of distributed applications', diff --git a/sonar-project.properties b/sonar-project.properties index d6e0841e11..43c0d1b7b1 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -4,7 +4,7 @@ sonar.organization=simgrid sonar.projectKey=simgrid_simgrid sonar.projectName=SimGrid -sonar.projectVersion=3.25.0 +sonar.projectVersion=3.25.1 sonar.links.homepage=https://simgrid.org sonar.links.issue=https://framagit.org/simgrid/simgrid/issues -- 2.20.1