Skip to content

spock5 issue with regression test #348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
moizpgedge merged 1 commit into from
Jul 2, 2025
Merged

spock5 issue with regression test #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build_all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if [ ! $num_p == "0" ] && [ ! $num_p == "1" ]; then
fi

if [ "$1" == "" ]; then
majorV=16
majorV=17
echo ""
echo "### Defaulting to pg $majorV ###"
else
Expand Down
10 changes: 8 additions & 2 deletions cli/scripts/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
MY_VERSION = "25.1.0"
MY_CODENAME = ""

DEFAULT_PG = "16"
DEFAULT_PG = "17"
DEFAULT_SPOCK = "50"
DEFAULT_SPOCK_17 = "50"
MY_CMD = os.getenv("MY_CMD", None)
Expand Down Expand Up @@ -138,12 +138,18 @@ def validate_spock_pg_compat(spock_ver: str = None, pg_ver: str = None) -> None:
Also supports shorthand Spock strings:
– "50" → "5.0.0", "40" → "4.0.0", etc.
"""
# 0) Fill in defaults if user didn’t pass anything
# 0) Fill in defaults if user didn’t pass anything
if not pg_ver:
pg_ver = DEFAULT_PG
else:
pg_ver = str(pg_ver) # ← force to string

if not spock_ver:
maj = int(pg_ver.split(".", 1)[0])
spock_ver = DEFAULT_SPOCK_17 if maj == 17 else DEFAULT_SPOCK
else:
spock_ver = str(spock_ver) # ← force to string


# 0.5) Normalize two-digit shorthand (e.g. "50" → "5.0.0")
m = re.fullmatch(r'(\d)(\d)$', spock_ver)
Expand Down