Merge remote-tracking branch 'github/master'

diff --git a/.github/workflows/docker-stable.yml b/.github/workflows/docker-stable.yml
index f4219b8..2008a3f 100644 (file)
--- a/.github/workflows/docker-stable.yml
+++ b/.github/workflows/docker-stable.yml
@@ -6,6 +6,7 @@ name: Docker stable
 # documentation.
 
 on:
+  workflow_dispatch:
   # Rebuild when changing the stable branch
   push:
       branches:
@@ -35,21 +36,20 @@ jobs:
 
       - 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 stable tuto-s4u tuto-smpi tuto-mc
+          make stable tuto-s4u tuto-smpi
           docker push simgrid/stable
-          docker push simgrid/unstable
           docker push simgrid/tuto-s4u
           docker push simgrid/tuto-smpi
-          docker push simgrid/tuto-mc
       - name: Create the failure Message
         if: ${{ failure() }}
         run: |
-          echo "{\"attachments\": [{\"color\": \"#FF0000\", \"text\":\"Failure when building docker images ! See ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} \"}]}" > mattermost.json
+          echo "{\"attachments\": [{\"color\": \"#FF0000\", \"text\":\"Failure when building STABLE docker images ! 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 images built and pushed successfully ! ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} \"}]}" > mattermost.json
+          echo "{\"attachments\": [{\"color\": \"#00FF00\", \"text\":\"Docker STABLE images 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 }}

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 3a84db3..13dd5ed 100644 (file)
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,4 +1,4 @@
-name: Docker
+name: Docker unstable
 
 # This workflow uses actions that are not certified by GitHub.
 # They are provided by a third-party and are governed by
@@ -33,8 +33,9 @@ jobs:
       - name: build
         run: |
           cd tools/docker
-          make unstable
-          make push
+          make unstable tuto-mc
+          docker push simgrid/unstable
+          docker push simgrid/tuto-mc
       - name: Create the failure Message
         if: ${{ failure() }}
         run: |

diff --git a/docs/source/Release_Notes.rst b/docs/source/Release_Notes.rst
index d605cfa..494f361 100644 (file)
--- a/docs/source/Release_Notes.rst
+++ b/docs/source/Release_Notes.rst
@@ -408,6 +408,7 @@ or python, and the XML approach is now deprecated. It will probably remain aroun
 be ported to the XML parser (unless you provide a patch, of course).
 
 This release also paves the way for new models, with the introduction of two new features to the model solver:
+
  * Non-linear resource sharing was introduced, allowing to model resource whose performance heavily degrades with contention. This may be used in the
    future for Wi-Fi links, where the total amount of data exchanged in a cell drops when the amount of stations reaches a threshold.
  * Dynamic factors model variability in the speed of activities. This can be used to model an overhead (e.g., there is a 20 bytes header in a 480