Skip to content

Commit 21df6e5

Browse files
elijahbenizzyElijah ben Izzy
andauthored
Updates to clean up upload file names, upload everything (#625)
Co-authored-by: Elijah ben Izzy <ebenizzy@salesforce.com>
1 parent aa4bb19 commit 21df6e5

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

scripts/apache_release.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -302,9 +302,9 @@ def _create_git_archive(version: str, rc_num: str, output_dir: str = "dist") ->
302302

303303
os.makedirs(output_dir, exist_ok=True)
304304

305-
archive_name = f"apache-burr-{version}-incubating-src.tar.gz"
305+
archive_name = f"apache-burr-{version}-incubating.tar.gz"
306306
archive_path = os.path.join(output_dir, archive_name)
307-
prefix = f"apache-burr-{version}-incubating-src/"
307+
prefix = f"apache-burr-{version}-incubating/"
308308

309309
try:
310310
subprocess.run(
@@ -383,7 +383,7 @@ def _build_sdist_from_git(version: str, output_dir: str = "dist") -> str:
383383

384384
original_sdist = sdist_files[0]
385385
apache_sdist = os.path.join(
386-
output_dir, f"apache-burr-{version.lower()}-incubating-src-sdist.tar.gz"
386+
output_dir, f"apache-burr-{version.lower()}-incubating-sdist.tar.gz"
387387
)
388388

389389
if os.path.exists(apache_sdist):
@@ -579,7 +579,9 @@ def _collect_all_artifacts(version: str, output_dir: str = "dist") -> list[str]:
579579

580580
artifacts = []
581581
for filename in os.listdir(output_dir):
582-
if f"{version}-incubating" in filename:
582+
# Match both incubating artifacts and wheel (which doesn't have -incubating suffix)
583+
version_match = f"{version}-incubating" in filename or f"{version}" in filename
584+
if version_match:
583585
if any(filename.endswith(ext) for ext in [".tar.gz", ".whl", ".asc", ".sha512"]):
584586
artifacts.append(os.path.join(output_dir, filename))
585587

0 commit comments

Comments
 (0)