Re-organize build scripts, add to shellcheck - #2380
Merged
Merged
Conversation
mmlb
force-pushed
the
push-otnrwzwtskkr
branch
from
August 19, 2026 19:00
1f9b1e9 to
a908fa0
Compare
PostgreSQL Extension Dependency Analysis: PR #2380
SummaryNo extensions had dependencies with MAJOR version updates. Full Analysis ResultsPostgreSQL 15 Extension DependenciesPostgreSQL 17 Extension DependenciesOrioleDB 17 Extension Dependencies |
PostgreSQL Package Dependency Analysis: PR #2380
SummaryNo packages had MAJOR version updates. Full Analysis ResultsPostgreSQL 15 Dependency ChangesExtracting PostgreSQL 15 dependencies...
Runtime Closure Size
Raw Dependency ClosurePostgreSQL 17 Dependency ChangesExtracting PostgreSQL 17 dependencies...
Runtime Closure Size
Raw Dependency Closure |
hunleyd
requested changes
Aug 19, 2026
hunleyd
left a comment
hunleyd
left a comment
Contributor
There was a problem hiding this comment.
.github/workflows/check-shellscripts.yml — "scripts aren't being shellchecked in CI" is still true after this PR. Fix: add a third scandir: './ebssurrogate/scripts' step.
mmlb
force-pushed
the
push-otnrwzwtskkr
branch
from
August 19, 2026 20:01
a908fa0 to
f1ca18a
Compare
Collaborator
Author
|
Thanks for the review @hunleyd, I addressed all the points (will resolve comments in a moment). I had left out the |
Collaborator
Author
I wanted it in nix/git-hooks so that it can be used as Nix CI required check |
mmlb
enabled auto-merge
August 19, 2026 20:33
hunleyd
requested changes
Aug 20, 2026
mmlb
force-pushed
the
push-otnrwzwtskkr
branch
from
August 20, 2026 14:20
f1ca18a to
c49f9ee
Compare
hunleyd
requested changes
Aug 20, 2026
mmlb
force-pushed
the
push-otnrwzwtskkr
branch
from
August 20, 2026 16:08
c49f9ee to
be39f66
Compare
hunleyd
approved these changes
Aug 20, 2026
mmlb
disabled auto-merge
August 20, 2026 16:43
mmlb
enabled auto-merge
August 20, 2026 16:43
I noticed that ansible.cfg isn't used anywhere in the repo so can go away.
Most of these files aren't being used so no point having them in the tree. Its a little weird to have cleanup-qemu.sh in ebssurrogate subdir but there's already one file there so meh. I deleted ebssurrogate/USAGE.md because its woefully out-of-date and I will soon have a PR that builds the image with one simple trick^Wcommand.
These are all pretty mechanical cleanups/simplifications + making
shellcheck happy. Using <<- flavored heredocs is nice to have because we
get better indentation based code scanning. I used [[ ]] and (( ))
bashism because they are better than POSIX they replace.
I also dropped unnecessary `${}` and `var="..."` for both consistency
and because I like it better that way :D. The real reason is I think
over-user of `${}` can lead to thinking its same as `"$"` for safety (
its not) and also tends to lead to inconsistent use. Variable assignment
doesn't need quotes because expansion does not take place in bash.
sudo/su isn't needed in many of the invocations, most of the scripts are
run as root, all except for nix-provision.sh. Almost every command in
nix-provision.sh is run with sudo so I changed packer to run the whole
script with sudo instead, like done for stage1.
mmlb
force-pushed
the
push-otnrwzwtskkr
branch
from
August 20, 2026 16:44
be39f66 to
71bade0
Compare
I'm dropping check-shellscripts.yml since nix/hooks.nix is now a superset. This means that I need a new GHA job to collect the matrix jobs so that we can change the branch protection check to this. Can't use `pre-commit-run (*)` because they don't exist on re-builds due to nix caching and can't use the `no checks to build (*)` because it doesn't exist when there are checks to build/run... :D
mmlb
force-pushed
the
push-otnrwzwtskkr
branch
from
August 20, 2026 18:37
71bade0 to
283ab70
Compare
pull Bot
pushed a commit
to Spencerx/postgres
that referenced
this pull request
Aug 22, 2026
* nix-provision: Remove unnecessary sudos This was left over from supabase#2380 from when I did some commit re-ordering. * ci/testinfra: Drop docker stuff We don't use docker in the tests so no need to do any of these actions/install packages. * AMI: Report disk usage I've had a few occasions where I wanted to see disk usage changes and had to create a one-of PR to do so. Since AMI image size is important to us we should at least show it somewhere. I might post as a comment in the future, holding off for now because I'd like to post just one comment with the Postgres Extension Dependency Analysis info too. Note: I'm aware that if there's any issue getting, outputting, parsing the disk usage it'll break the build and I'm ok with that. I want to see disk usage and if we can't get it then something is wrong and should be fixed.
hunleyd
added a commit
that referenced
this pull request
Aug 22, 2026
…c-spool-path-defaults-onto-the-10gb-root-volume * origin/develop: Report final AMI disk usage to workflow job (#2384) Re-organize build scripts, add to shellcheck (#2380) feat: Do not hardcode `orioledb.main_buffers` in `postgresql.conf` (#2365) feat: add orioledb debug symbols (#2379) chore: Make postgresql.env optional in database-optimizations.service (#2372) feat: bump to PostgREST v14.17 (#2374) ansible: Bump versions to get new AMIs built (#2376) Revert PostgREST bump to v14.17 (#2371) fix: disable APT timers during Supabase upgrades (#2358) gha/nix-install-ephemeral: Actually copy to s3, not just echo it (#2369) feat: bump to PostgREST v14.17 (#2363) feat: add guest-to-host time synchronisation (#2364) ci: Add final job that depends on the important jobs (#2361) feat: Add ORIOLEDB_ENABLED into /etc/environment.d/postgresql.env (#2362) fix: harden post-upgrade vacuum analyze in pg_upgrade complete script (#2356) feat: Bump admin-api to 0.114.0 (#2342) feat: [ansible/tasks] adding reindex script for collation version change (#2343) Revert "Lots of bootstrap script clean ups (#2326)" (#2357) ci: Delete nix-eval workflow (#2347)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What kind of change does this PR introduce?
Maintenance
What is the current behavior?
Image build scripts are split between ebssurroage and scripts dir, most of those in scripts/ aren't even used. The scripts aren't being shellchecked in CI.
What is the new behavior?
Moved useful scripts into ebssurrogate and made them shellcheck clean. I added a shellcheck lint to git-hooks too. Dropped ansible.cfg since I noticed its not used and might as well do so now.