Skip to content

Commit e598814

Browse files
committed
Require Sigstore >= 3.6.2, < 4
1 parent e46e41c commit e598814

2 files changed

Lines changed: 12 additions & 9 deletions

File tree

run_release.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -368,13 +368,16 @@ def check_sigstore_client(db: ReleaseShelf) -> None:
368368

369369
def check_sigstore_version(version: str) -> None:
370370
version_match = re.match("^sigstore ([0-9.]+)", version)
371-
if not version_match or tuple(
372-
int(part) for part in version_match.group(1).split(".")
373-
) < (3, 5):
374-
raise ReleaseException(
375-
f"Sigstore version not detected or not valid. "
376-
f"Expecting 3.5.x or later: {version}"
377-
)
371+
if version_match:
372+
version_tuple = tuple(int(part) for part in version_match.group(1).split("."))
373+
if (3, 6, 2) <= version_tuple < (4, 0):
374+
# good version
375+
return
376+
377+
raise ReleaseException(
378+
f"Sigstore version not detected or not valid. "
379+
f"Expecting >= 3.6.2 and < 4.0.0, got: {version}"
380+
)
378381

379382

380383
def check_buildbots(db: ReleaseShelf) -> None:

tests/test_run_release.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
@pytest.mark.parametrize(
1515
"version",
16-
["sigstore 3.5.0", "sigstore 4.0.0"],
16+
["sigstore 3.6.2", "sigstore 3.6.6"],
1717
)
1818
def test_check_sigstore_version_success(version) -> None:
1919
# Verify runs with no exceptions
@@ -22,7 +22,7 @@ def test_check_sigstore_version_success(version) -> None:
2222

2323
@pytest.mark.parametrize(
2424
"version",
25-
["sigstore 2.0.0", "sigstore 3.4.0", ""],
25+
["sigstore 3.4.0", "sigstore 3.6.0", "sigstore 4.0.0", ""],
2626
)
2727
def test_check_sigstore_version_exception(version) -> None:
2828
with pytest.raises(

0 commit comments

Comments
 (0)