Mesa (staging/20.1): post_version.py: stop adding release candidates to the index and relnotes

[GitLab Mirror]

Module: Mesa
Branch: staging/20.1
Commit: 9759a8627238acdc24ff16361ca0e7a9296ac9f4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9759a8627238acdc24ff16361ca0e7a9296ac9f4

Author: Eric Engestrom <eric at engestrom.ch>
Date:   Thu May  7 00:20:46 2020 +0200

post_version.py: stop adding release candidates to the index and relnotes

Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2870
Signed-off-by: Eric Engestrom <eric at engestrom.ch>
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4929>
(cherry picked from commit 445e559e35ae3151d7587f61310ec0fc25c90982)

---

 .pick_status.json   |  2 +-
 bin/post_version.py | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 11e75b3af75..fe0946ee1d2 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1894,7 +1894,7 @@
         "description": "post_version.py: stop adding release candidates to the index and relnotes",
         "nominated": false,
         "nomination_type": null,
-        "resolution": 4,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/bin/post_version.py b/bin/post_version.py
index 446fae9880b..c55309d9387 100755
--- a/bin/post_version.py
+++ b/bin/post_version.py
@@ -134,12 +134,16 @@ def main() -> None:
     parser.add_argument('version', help="The released version.")
     args = parser.parse_args()
 
-    update_index(args.version)
-    update_release_notes(args.version)
     update_calendar(args.version)
+    done = 'update calendar'
+
+    if not is_release_candidate(args.version):
+        update_index(args.version)
+        update_release_notes(args.version)
+        done += ', add news item, and link releases notes'
+
     subprocess.run(['git', 'commit', '-m',
-                    'docs: update calendar, add news item, and link releases '
-                    f'notes for {args.version}'])
+                    f'docs: {done} for {args.version}'])
 
 
 if __name__ == "__main__":