Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' of framagit.org:simgrid/simgrid
authorMartin Quinson <martin.quinson@ens-rennes.fr>
Mon, 31 Jan 2022 00:04:24 +0000 (01:04 +0100)
committerMartin Quinson <martin.quinson@ens-rennes.fr>
Mon, 31 Jan 2022 00:04:24 +0000 (01:04 +0100)
.github/workflows/docker-stable.yml
.github/workflows/docker.yml
CMakeLists.txt
ChangeLog
NEWS
docs/source/conf.py
setup.py
sonar-project.properties
tools/docker/Dockerfile.tuto-s4u

index bf95828..c49925f 100644 (file)
@@ -15,7 +15,7 @@ on:
 #    types: [published, created, edited]
 
 jobs:
-  build:
+  docker-simgrid:
 
     runs-on: ubuntu-latest
     permissions:
@@ -38,17 +38,96 @@ jobs:
         run: |
           grep SIMGRID_VERSION_PATCH CMakeLists.txt| grep -q 'SIMGRID_VERSION_PATCH "0"' || (echo "Only run this action on stable source";exit 1)
           cd tools/docker
-          make stable tuto-smpi
+          make stable
           docker push simgrid/stable
+      - name: Create the failure Message
+        if: ${{ failure() }}
+        run: |
+          ver=$(git describe --tags --abbrev=0) echo "{\"attachments\": [{\"color\": \"#FF0000\", \"text\":\"Failure when building STABLE docker image $ver! See ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} \"}]}" > mattermost.json
+      - name: Create the success Message
+        if: ${{ success() }}
+        run: |
+          ver=$(git describe --tags --abbrev=0) echo "{\"attachments\": [{\"color\": \"#00FF00\", \"text\":\"Docker STABLE image $ver built and pushed successfully! ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} \"}]}" > mattermost.json
+      - uses: mattermost/action-mattermost-notify@master
+        env:
+          MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK_URL }}
+          MATTERMOST_CHANNEL: ${{ secrets.MATTERMOST_CHANNEL}}
+
+
+  docker-tuto-s4u:
+
+    # the Dockerfile builds upon the docker-unstable image, so add a dependency
+    needs: docker-simgrid
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      # Login against a Docker registry except on PR
+      # https://github.com/docker/login-action
+      - name: Log into registry ${{ env.REGISTRY }}
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: build docker tuto-s4u
+        run: |
+          cd tools/docker
+          make tuto-s4u
+          docker push simgrid/tuto-s4u
+      - name: Create the failure Message
+        if: ${{ failure() }}
+        run: |
+          ver=$(git describe --tags --abbrev=0) echo "{\"attachments\": [{\"color\": \"#FF0000\", \"text\":\"Failure when building docker tuto-s4u image $ver! See ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} \"}]}" > mattermost.json
+      - name: Create the success Message
+        if: ${{ success() }}
+        run: |
+          ver=$(git describe --tags --abbrev=0) echo "{\"attachments\": [{\"color\": \"#00FF00\", \"text\":\"Docker tuto-s4u $ver image built and pushed successfully! ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} \"}]}" > mattermost.json
+      - uses: mattermost/action-mattermost-notify@master
+        env:
+          MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK_URL }}
+          MATTERMOST_CHANNEL: ${{ secrets.MATTERMOST_CHANNEL}}
+
+  docker-tuto-smpi:
+    # the Dockerfile builds upon the docker-stable image, so add a dependency
+    needs: docker-simgrid
+    
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      # Login against a Docker registry except on PR
+      # https://github.com/docker/login-action
+      - name: Log into registry ${{ env.REGISTRY }}
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: build
+        run: |
+          grep SIMGRID_VERSION_PATCH CMakeLists.txt| grep -q 'SIMGRID_VERSION_PATCH "0"' || (echo "Only run this action on stable source";exit 1)
+          cd tools/docker
+          make tuto-smpi
           docker push simgrid/tuto-smpi
       - name: Create the failure Message
         if: ${{ failure() }}
         run: |
-          echo "{\"attachments\": [{\"color\": \"#FF0000\", \"text\":\"Failure when building STABLE docker images ! See ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} \"}]}" > mattermost.json
+          ver=$(git describe --tags --abbrev=0) echo "{\"attachments\": [{\"color\": \"#FF0000\", \"text\":\"Failure when building SMPI $ver docker image on stable docker! See ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} \"}]}" > mattermost.json
       - name: Create the success Message
         if: ${{ success() }}
         run: |
-          echo "{\"attachments\": [{\"color\": \"#00FF00\", \"text\":\"Docker STABLE images built and pushed successfully ! ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} \"}]}" > mattermost.json
+          ver=$(git describe --tags --abbrev=0) echo "{\"attachments\": [{\"color\": \"#00FF00\", \"text\":\"Docker SMPI $ver stable image built and pushed successfully! ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} \"}]}" > mattermost.json
       - uses: mattermost/action-mattermost-notify@master
         env:
           MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK_URL }}
index 66339f5..17f6084 100644 (file)
@@ -11,7 +11,7 @@ on:
     - cron: '42 18 * * 0'
 
 jobs:
-  docker-unstable:
+  docker-simgrid:
 
     runs-on: ubuntu-latest
     permissions:
@@ -48,44 +48,6 @@ jobs:
           MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK_URL }}
           MATTERMOST_CHANNEL: ${{ secrets.MATTERMOST_CHANNEL}}
 
-  docker-tuto-s4u:
-
-    # the Dockerfile builds upon the docker-unstable image, so add a dependency
-    needs: docker-unstable
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
-      # Login against a Docker registry except on PR
-      # https://github.com/docker/login-action
-      - name: Log into registry ${{ env.REGISTRY }}
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: build docker tuto-s4u
-        run: |
-          cd tools/docker
-          make tuto-s4u
-          docker push simgrid/tuto-s4u
-      - name: Create the failure Message
-        if: ${{ failure() }}
-        run: |
-          echo "{\"attachments\": [{\"color\": \"#FF0000\", \"text\":\"Failure when building docker tuto-s4u image ! See ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} \"}]}" > mattermost.json
-      - name: Create the success Message
-        if: ${{ success() }}
-        run: |
-          echo "{\"attachments\": [{\"color\": \"#00FF00\", \"text\":\"Docker tuto-s4u image built and pushed successfully ! ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} \"}]}" > mattermost.json
-      - uses: mattermost/action-mattermost-notify@master
-        env:
-          MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK_URL }}
-          MATTERMOST_CHANNEL: ${{ secrets.MATTERMOST_CHANNEL}}
 
   docker-tuto-mc:
 
index 1d6874f..6d51656 100644 (file)
@@ -2,7 +2,7 @@
 
 set(SIMGRID_VERSION_MAJOR "3")
 set(SIMGRID_VERSION_MINOR "30")
-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
 
 if(${SIMGRID_VERSION_PATCH} EQUAL "0")
   set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}")
index 42cd05a..581d490 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+SimGrid (3.30.1) NOT RELEASED YET (v3.31 expected March 20. 2022, 15:33 UTC)
+
 ----------------------------------------------------------------------------
 
 SimGrid (3.30) January 30. 2022.
diff --git a/NEWS b/NEWS
index 5361f35..2cb98eb 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+                    _               _____  _____ _
+__   _____ _ __ ___(_) ___  _ __   |___ / |___ // |
+\ \ / / _ \ '__/ __| |/ _ \| '_ \    |_ \   |_ \| |
+ \ V /  __/ |  \__ \ | (_) | | | |  ___) | ___) | |
+  \_/ \___|_|  |___/_|\___/|_| |_| |____(_)____/|_|
+               (unreleased)
+
+
                     _               _____  _____  ___
 __   _____ _ __ ___(_) ___  _ __   |___ / |___ / / _ \
 \ \ / / _ \ '__/ __| |/ _ \| '_ \    |_ \   |_ \| | | |
@@ -7,7 +15,7 @@ __   _____ _ __ ___(_) ___  _ __   |___ / |___ / / _ \
 
 The Sunday Bloody Sunday release.
 
-  * SimDAG is finally removed, fully superseeded by S4U.
+  * SimDAG is finally removed, fully superseded by S4U.
   * New documentation on calibrating MPI.
   * The Algorithms tutorial can now be taken in Python.
   * (+ many bug fixes and internal refactoring)
index 7be3c94..2be4218 100644 (file)
@@ -36,7 +36,7 @@ copyright = u'2002-2022, The SimGrid Team'
 author = u'The SimGrid Team'
 
 # The short X.Y version
-version = u'3.30'
+version = u'3.30.1'
 
 # -- General configuration ---------------------------------------------------
 
index d8f3323..22d45d2 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ class CMakeBuild(build_ext):
 
 setup(
     name='simgrid',
-    version='3.30',
+    version='3.30.1',
     author='Da SimGrid Team',
     author_email='simgrid-devel@lists.gforge.inria.fr',
     description='Toolkit for scalable simulation of distributed applications',
index 42c7ccf..8b097f4 100644 (file)
@@ -4,7 +4,7 @@
 sonar.organization=simgrid
 sonar.projectKey=simgrid_simgrid
 sonar.projectName=SimGrid
-sonar.projectVersion=3.30
+sonar.projectVersion=3.30.1
 
 sonar.links.homepage=https://simgrid.org
 sonar.links.issue=https://framagit.org/simgrid/simgrid/issues
index f1f5939..0c853db 100644 (file)
@@ -1,5 +1,5 @@
 # Base image
-FROM simgrid/unstable
+FROM simgrid/stable
 
 RUN apt update && apt -y upgrade