Skip to content

[BR-158]: Introduce spock60 builds in CLI #362

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
hayee-bhatti merged 1 commit into from
Aug 1, 2025
Merged

[BR-158]: Introduce spock60 builds in CLI #362

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
8 changes: 4 additions & 4 deletions .github/workflows/current-amd8-daily-build-devel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: Current Daily Build Devel - amd8
env:
DEFAULT_CLI_BRANCH: "main" # Default CLI branch for scheduled runs
DEFAULT_MODE: "current" # Always "current" for this workflow
DEFAULT_COMPONENT: "spock50" # Default spock component name
DEFAULT_COMPONENT: "spock60" # Default spock component name
DEFAULT_BRANCH: "main" # Default branch for the spock component
DEFAULT_CLEAN_FLAG: "false" # Default clean flag for scheduled runs

Expand All @@ -13,7 +13,7 @@ on:
workflow_dispatch:
inputs:
cli_branch:
description: "Select the CLI branch to build from (e.g. v25_STABLE)"
description: "Select the CLI branch to build from (e.g. main)"
required: true
default: "main"
type: choice
Expand All @@ -23,9 +23,9 @@ on:
- REL24_10

component:
description: "Spock in-dev component to additionally build (e.g. spock50)"
description: "Spock in-dev component to additionally build (e.g. spock60)"
required: true
default: "spock50"
default: "spock60"
type: string

branch:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/current-arm9-daily-build-devel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: Current Daily Build Devel - arm9
env:
DEFAULT_CLI_BRANCH: "main" # Default CLI branch for scheduled runs
DEFAULT_MODE: "current" # Always "current" for this workflow
DEFAULT_COMPONENT: "spock50" # Default spock component name
DEFAULT_COMPONENT: "spock60" # Default spock component name
DEFAULT_BRANCH: "main" # Default branch for the spock component
DEFAULT_CLEAN_FLAG: "false" # Default clean flag for scheduled runs

Expand All @@ -13,7 +13,7 @@ on:
workflow_dispatch:
inputs:
cli_branch:
description: "Select the CLI branch to build from (e.g. v25_STABLE)"
description: "Select the CLI branch to build from (e.g. main)"
required: true
default: "main"
type: choice
Expand All @@ -23,9 +23,9 @@ on:
- REL24_10

component:
description: "Spock in-dev component to additionally build (e.g. spock50)"
description: "Spock in-dev component to additionally build (e.g. spock60)"
required: true
default: "spock50"
default: "spock60"
type: string

branch:
Expand Down
3 changes: 3 additions & 0 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,18 +358,21 @@ initPG () {
initC "audit-pg$pgM" "audit" "$audit17V" "$outPlat" "postgres/audit" "" "" "nil"
initC "hintplan-pg$pgM" "hintplan" "$hint17V" "$outPlat" "postgres/hintplan" "" "" "nil"
initC "spock50-pg$pgM" "spock50" "$spock50V" "$outPlat" "postgres/spock50" "" "" "nil"
initC "spock60-pg$pgM" "spock60" "$spock60V" "$outPlat" "postgres/spock60" "" "" "nil"
fi

if [ "$pgM" == "16" ]; then
initC "audit-pg$pgM" "audit" "$audit16V" "$outPlat" "postgres/audit" "" "" "nil"
initC "hintplan-pg$pgM" "hintplan" "$hint16V" "$outPlat" "postgres/hintplan" "" "" "nil"
initC "spock50-pg$pgM" "spock50" "$spock50V" "$outPlat" "postgres/spock50" "" "" "nil"
initC "spock60-pg$pgM" "spock60" "$spock60V" "$outPlat" "postgres/spock60" "" "" "nil"
fi

if [ "$pgM" == "15" ]; then
initC "audit-pg$pgM" "audit" "$audit15V" "$outPlat" "postgres/audit" "" "" "nil"
initC "hintplan-pg$pgM" "hintplan" "$hint15V" "$outPlat" "postgres/hintplan" "" "" "nil"
initC "spock50-pg$pgM" "spock50" "$spock50V" "$outPlat" "postgres/spock50" "" "" "nil"
initC "spock60-pg$pgM" "spock60" "$spock60V" "$outPlat" "postgres/spock60" "" "" "nil"
fi

if [ "$pgM" == "15" ] || [ "$pgM" == "16" ] || [ "$pgM" == "17" ]; then
Expand Down
2 changes: 2 additions & 0 deletions env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ bundle=pgedge
api=pgedge
ctlibsV=1.7

spock60V=6.0.0-devel-1

spock50V=5.0.0-1

spock40V=4.0.10-1
Expand Down
14 changes: 14 additions & 0 deletions src/conf/versions.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@ INSERT INTO extensions VALUES ('spock50', 'spock', 1, 'spock',
max_wal_senders=16 | hot_standby_feedback=on | wal_sender_timeout=5s |
track_commit_timestamp=on | spock.conflict_resolution=last_update_wins |
spock.save_resolutions=on | spock.conflict_log_level=DEBUG');
INSERT INTO extensions VALUES ('spock60', 'spock', 1, 'spock',
'wal_level=logical | max_worker_processes=12 | max_replication_slots=16 |
max_wal_senders=16 | hot_standby_feedback=on | wal_sender_timeout=5s |
track_commit_timestamp=on | spock.conflict_resolution=last_update_wins |
spock.save_resolutions=on | spock.conflict_log_level=DEBUG');
INSERT INTO extensions VALUES ('lolor', 'lolor', 0, '', '');
INSERT INTO extensions VALUES ('postgis', 'postgis', 1, 'postgis-3', '');
INSERT INTO extensions VALUES ('setuser', 'set_user', 1, 'set_user', '');
Expand Down Expand Up @@ -342,6 +347,15 @@ INSERT INTO versions VALUES ('spock50-pg15', '5.0.0-1', 'amd, arm', 1, '202507
INSERT INTO versions VALUES ('spock50-pg16', '5.0.0-1', 'amd, arm', 1, '20250715', 'pg16', '', '');
INSERT INTO versions VALUES ('spock50-pg17', '5.0.0-1', 'amd, arm', 1, '20250715', 'pg17', '', '');

-- ## spock60 ###########################
INSERT INTO releases VALUES ('spock60-pg15', 4, 'spock', 'Spock', '', 'test', '', 1, 'pgEdge Community', '', '');
INSERT INTO releases VALUES ('spock60-pg16', 4, 'spock', 'Spock', '', 'test', '', 1, 'pgEdge Community', '', '');
INSERT INTO releases VALUES ('spock60-pg17', 4, 'spock', 'Spock', '', 'test', '', 1, 'pgEdge Community', '', '');

INSERT INTO versions VALUES ('spock60-pg15', '6.0.0-devel-1', 'amd, arm', 1, '20250801', 'pg15', '', '');
INSERT INTO versions VALUES ('spock60-pg16', '6.0.0-devel-1', 'amd, arm', 1, '20250801', 'pg16', '', '');
INSERT INTO versions VALUES ('spock60-pg17', '6.0.0-devel-1', 'amd, arm', 1, '20250801', 'pg17', '', '');

-- ## LOLOR #############################
INSERT INTO projects VALUES ('lolor', 'pge', 4, 0, '', 1, 'https://github.com/pgedge/lolor/tags',
'spock', 1, 'spock.png', 'Logical Replication of Large Objects', 'https://github.com/pgedge/lolor/#spock', 'lola, lolah, kinks');
Expand Down