ci: grab default release tag from Git commit time

This should make the datetime strings consistent across all platforms.

Author: indygreg

.github/workflows/linux.yml

@@ -136,8 +136,6 @@ jobs:
 
       - name: Build
         run: |
-          export PYBUILD_RELEASE_TAG=$(git log -n 1 --date=format:%Y%m%dT%H%M --pretty=format:%ad)
-
           if [ "${{ matrix.triple }}" = "x86_64-unknown-linux-musl" ]; then
             EXTRA_ARGS=--libressl
           else

.github/workflows/macos.yml

@@ -118,7 +118,6 @@ jobs:
 
       - name: Build
         run: |
-          export PYBUILD_RELEASE_TAG=$(git log -n 1 --date=format:%Y%m%dT%H%M --pretty=format:%ad)
           ./build-macos.py --python ${{ matrix.py }} --optimizations ${{ matrix.optimizations }}
 
       - name: Stop sccache

cpython-unix/build-main.py

@@ -4,14 +4,16 @@
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 import argparse
-import datetime
 import os
 import pathlib
 import subprocess
 import sys
 
 from pythonbuild.downloads import DOWNLOADS
-from pythonbuild.utils import compress_python_archive
+from pythonbuild.utils import (
+    compress_python_archive,
+    release_tag_from_git,
+)
 
 ROOT = pathlib.Path(os.path.abspath(__file__)).parent.parent
 BUILD = ROOT / "build"
@@ -91,8 +93,7 @@ def main():
     if "PYBUILD_RELEASE_TAG" in os.environ:
         release_tag = os.environ["PYBUILD_RELEASE_TAG"]
     else:
-        now = datetime.datetime.utcnow()
-        release_tag = now.strftime("%Y%m%dT%H%M")
+        release_tag = release_tag_from_git()
 
     archive_components = [
         "cpython-%s" % entry["version"],

cpython-windows/build.py

@@ -5,7 +5,6 @@
 
 import argparse
 import concurrent.futures
-import datetime
 import json
 import os
 import pathlib
@@ -25,6 +24,7 @@
     extract_tar_to_directory,
     extract_zip_to_directory,
     compress_python_archive,
+    release_tag_from_git,
     validate_python_json,
 )
 
@@ -2322,8 +2322,6 @@ def main():
         print("--sh required when building Python 3.8+")
         return 1
 
-    now = datetime.datetime.utcnow()
-
     log_path = BUILD / "build.log"
 
     with log_path.open("wb") as log_fh:
@@ -2365,8 +2363,13 @@ def main():
             libffi_archive=libffi_archive,
         )
 
+        if "PYBUILD_RELEASE_TAG" in os.environ:
+            release_tag = os.environ["PYBUILD_RELEASE_TAG"]
+        else:
+            release_tag = release_tag_from_git()
+
         compress_python_archive(
-            tar_path, DIST, "%s-%s" % (tar_path.stem, now.strftime("%Y%m%dT%H%M")),
+            tar_path, DIST, "%s-%s" % (tar_path.stem, release_tag),
         )
 
 

pythonbuild/utils.py

@@ -19,6 +19,23 @@
 from .logging import log
 
 
+def release_tag_from_git():
+    return (
+        subprocess.check_output(
+            [
+                "git",
+                "log",
+                "-n",
+                "1",
+                "--date=format:%Y%m%dT%H%M",
+                "--pretty=format:%ad",
+            ]
+        )
+        .strip()
+        .decode("ascii")
+    )
+
+
 def hash_path(p: pathlib.Path):
     h = hashlib.sha256()