From: Martin Quinson Date: Fri, 5 Oct 2018 21:16:36 +0000 (+0200) Subject: Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid X-Git-Tag: v3_22~921 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/5e41cea3f1d670f198f312cfe398af95b9ed7b40?hp=cdbaa4bb84a9d26bea306ce8e2b0e8dcb97ec787 Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e9c98d877..5abb679ec4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,8 +109,8 @@ endif() set(SIMGRID_VERSION_MAJOR "3") set(SIMGRID_VERSION_MINOR "21") -set(SIMGRID_VERSION_PATCH "0") -#set(SIMGRID_VERSION_EXTRA "-DEVEL") # Extra words to add to version string (e.g. -rc1) +set(SIMGRID_VERSION_PATCH "90") +set(SIMGRID_VERSION_EXTRA "-DEVEL") # Extra words to add to version string (e.g. -rc1) set(SIMGRID_VERSION_DATE "2018") # Year for copyright information diff --git a/ChangeLog b/ChangeLog index dc87677d26..3fe5f937a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +SimGrid (3.22) NOT RELEASED (Release Target: December 21. 2018, 22:23 UTC) + SimGrid (3.21) October 3. 2018 The Restarting Documentation (TRD) Release. diff --git a/NEWS b/NEWS index 965bd0bce5..c5a113b0db 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,10 @@ + _ _____ ____ ____ +__ _____ _ __ ___(_) ___ _ __ |___ / |___ \|___ \ +\ \ / / _ \ '__/ __| |/ _ \| '_ \ |_ \ __) | __) | + \ V / __/ | \__ \ | (_) | | | | ___) | / __/ / __/ + \_/ \___|_| |___/_|\___/|_| |_| |____(_)_____|_____| + (not released) + _ _____ ____ _ __ _____ _ __ ___(_) ___ _ __ |___ / |___ \/ | \ \ / / _ \ '__/ __| |/ _ \| '_ \ |_ \ __) | | diff --git a/doc/doxygen/inside_release.doc b/doc/doxygen/inside_release.doc index 3cbc5eb377..b9fafef2c6 100644 --- a/doc/doxygen/inside_release.doc +++ b/doc/doxygen/inside_release.doc @@ -11,8 +11,10 @@ Please apply the following checklist before releasing. - The external patches (Debian, etc) are integrated. The COPYING file is aligned with Debian's copyright file, and the dates of SimGrid chunks are accurate. - - The version number is correctly marked in CMakeLists.txt (in macros - SIMGRID_VERSION_*), and also in sonar-project.properties + - The version number is correctly marked in + - CMakeLists.txt (in macros SIMGRID_VERSION_*) + - sonar-project.properties + - docs/source/conf.py - The "make distcheck" target works (testing that every files needed to build and install are included in the archive) - Tests @@ -101,7 +103,8 @@ the settings icon of the release you want to change. - Push the archive files (tar.gz and jar) on gforge - Post a news on gforge (before updating the website) - Update the link scm.gforge.inria.fr:/home/groups/simgrid/htdocs/simgrid/latest - (and create the directory of the next version) + - Create the directory of the released version and upload the doc artefact in it + - Remove the older releases so that people don't find them in google - Rebuild and resynchronize the website so that the file gets visible from our download page.@n - Edit org/org-templates/level-0.org to change the release version, the tgz link and the jar link. @@ -111,30 +114,31 @@ the settings icon of the release you want to change. - make -C org all sync - git commit -a && git push - Announce the release - - Document the tag on https://github.com/simgrid/simgrid/releases + - Document the tag on https://github.com/simgrid/simgrid/releases and + on https://framagit.org/simgrid/simgrid/tags - Mail the simgrid-user mailing list - the NEWS chunk in the mail; - Hall of Fame in the mail@n - git shortlog -sne v3.18.. - - the ChangeLog chunk as attachment - - Also mail some other lists (G5K users), with only the NEWS chunk - and the link to the download section + git shortlog -se v3.21.. + - Link to the ChangeLog on framagit (the version of that tag) + - Also mail some other lists (G5K users) - Release the debian package - - make -f debian/rules get-orig-source - - gbp import ../simgrid_XXX+dfsg.orig.tar.xz + - rm -f ../simgrid_3.*+dfsg.orig.tar.xz + - uscan # download the new version + - gbp import-orig ../simgrid_3.*+dfsg.orig.tar.xz - dch -i "New upstream release" # + copy the NEWS into debian/changelog - git mv debian/libsimgrid3.XX.install debian/libsimgrid3.XY.install - - edit debian/control - - s/simgrid3.XX/simgrid3.XY/ - - libsimgrid3.XY conflicts with libsimgrid3.XX because of smpimain + - edit debian/control: s/simgrid3.XX/simgrid3.XY/ - Update the simgrid/package.py for spack: https://gitlab.inria.fr/solverstack/spack-repo - Create the template for the next release in ChangeLog and NEWS files Release Target date: https://en.wikipedia.org/wiki/Equinox -- Change the release number to 3.X.90 in CMakeLists.txt and sonar-project.properties +- Change the release number to 3.X.90 in CMakeLists.txt and sonar-project.properties docs/source/conf.py - Deal with deprecations: - Introduce the XBT_ATTRIB_DEPRECATED_v??? macro for the next release. - Kill the one for the current release and remove all code that were mandated by the deprecated functions (both in source and headers). - Do the possible cleanups now that these features are gone. +- Update the Docker images (after pushing to the git) + - cd tools/docker && make stable tuto-s4u push */ diff --git a/docs/source/conf.py b/docs/source/conf.py index b57d1f3837..74a792865d 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -35,7 +35,7 @@ copyright = u'2002-2018, The SimGrid Team' author = u'The SimGrid Team' # The short X.Y version -version = u'3.21' +version = u'alpha 3.22' # The full version, including alpha/beta/rc tags release = u'3.21' diff --git a/sonar-project.properties b/sonar-project.properties index c68483b249..99f0f9a110 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -3,7 +3,7 @@ sonar.projectKey=simgrid sonar.projectName=SimGrid -sonar.projectVersion=3.21 +sonar.projectVersion=3.21.90 sonar.links.homepage=http://simgrid.org sonar.links.issue=https://github.com/simgrid/simgrid/issues diff --git a/tools/docker/Dockerfile.tuto-s4u b/tools/docker/Dockerfile.tuto-s4u index 1753cc1267..7832a80bed 100644 --- a/tools/docker/Dockerfile.tuto-s4u +++ b/tools/docker/Dockerfile.tuto-s4u @@ -1,5 +1,5 @@ # Base image -FROM simgrid/unstable +FROM simgrid/stable # - Clone simgrid-template-s4u, as it is needed by the tutorial RUN apt update && apt install -y pajeng r-base r-cran-ggplot2 r-cran-dplyr cmake g++ git libboost-all-dev&& \