Use workflow ID in wheel upload

Author: Kyle-Neale

.builders/tests/test_upload.py

@@ -136,7 +136,7 @@ def test_upload_built_no_conflict(setup_targets_dir, setup_fake_bucket, workflow
 
     bucket_files = [f.name for f in bucket.list_blobs()]
     assert (
-        f'built/without-collision/without_collision-3.14.1-{workflow_id}-cp311-cp311-manylinux2010_x86_64.whl'
+        f'built/without-collision/without_collision-3.14.1-{workflow_id}WID-cp311-cp311-manylinux2010_x86_64.whl'
         in bucket_files
     )
 
@@ -204,7 +204,7 @@ def test_upload_built_existing_different_sha_does_upload(
     assert uploads == {'existing-1.1.1-cp311-cp311-manylinux2010_x86_64.whl'}
 
     bucket_files = {f.name for f in bucket.list_blobs()}
-    assert f'built/existing/existing-1.1.1-{workflow_id}-cp311-cp311-manylinux2010_x86_64.whl' in bucket_files
+    assert f'built/existing/existing-1.1.1-{workflow_id}WID-cp311-cp311-manylinux2010_x86_64.whl' in bucket_files
 
 
 def test_upload_built_existing_sha_match_does_not_upload_multiple_existing_builds(
@@ -282,7 +282,7 @@ def test_upload_built_existing_different_sha_does_upload_multiple_existing_build
     assert uploads == {'existing-1.1.1-cp311-cp311-manylinux2010_x86_64.whl'}
 
     bucket_files = {f.name for f in bucket.list_blobs()}
-    assert f'built/existing/existing-1.1.1-{workflow_id}-cp311-cp311-manylinux2010_x86_64.whl' in bucket_files
+    assert f'built/existing/existing-1.1.1-{workflow_id}WID-cp311-cp311-manylinux2010_x86_64.whl' in bucket_files
 
 
 def test_build_tag_use_workflow_id(
@@ -322,4 +322,4 @@ def test_build_tag_use_workflow_id(
     assert uploads == {'existing-1.1.1-cp311-cp311-manylinux2010_x86_64.whl'}
 
     bucket_files = {f.name for f in bucket.list_blobs()}
-    assert f'built/existing/existing-1.1.1-{workflow_id}-cp311-cp311-manylinux2010_x86_64.whl' in bucket_files
+    assert f'built/existing/existing-1.1.1-{workflow_id}WID-cp311-cp311-manylinux2010_x86_64.whl' in bucket_files

.builders/upload.py

@@ -58,6 +58,11 @@ def display_message_block(message: str) -> None:
     print(divider)
 
 
+def timestamp_build_number() -> int:
+    """Produce a numeric timestamp to use as build numbers"""
+    return int(time.strftime('%Y%m%d%H%M%S'))
+
+
 def hash_file(path: Path) -> str:
     """Calculate the hash of the file pointed at by `path`"""
     with path.open('rb') as f:
@@ -90,7 +95,7 @@ def _build_number_of_wheel_blob(wheel_path: Blob) -> int:
     return int(build_number[0]) if build_number else -1
 
 
-def upload(targets_dir, workflow_id):
+def upload(targets_dir):
     client = storage.Client()
     bucket = client.bucket(BUCKET_NAME)
     artifact_types: set[str] = set()
@@ -143,7 +148,8 @@ def upload(targets_dir, workflow_id):
                               'with the same hash')
                         continue
 
-                artifact_name = f'{name}-{version}-{workflow_id}-{python_tag}-{abi_tag}-{platform_tag}.whl'
+                build_number = timestamp_build_number()
+                artifact_name = f'{name}-{version}-{build_number}-{python_tag}-{abi_tag}-{platform_tag}.whl'
                 artifact = bucket.blob(f'{artifact_type}/{project_name}/{artifact_name}')
 
             print(f'{padding}Artifact: {artifact_name}')
@@ -207,6 +213,5 @@ def upload(targets_dir, workflow_id):
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(prog='builder', allow_abbrev=False)
     parser.add_argument('targets_dir')
-    parser.add_argument('workflow_id')
     args = parser.parse_args()
-    upload(args.targets_dir, args.workflow_id)
+    upload(args.targets_dir)