Skip to content

chore: wip upgrade pgroonga to latest #1418

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
merged 12 commits into from
Feb 4, 2025
Merged

chore: wip upgrade pgroonga to latest #1418

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0853e1a
chore: wip upgrade pgroonga to latest
samrose Jan 24, 2025
dadb895
chore: strings for staging tests of image
samrose Jan 30, 2025
db18510
Merge branch 'develop' into sam/pgroonga-update
samrose Jan 30, 2025
0f175e0
chore: staging version
samrose Jan 30, 2025
bebe003
chore: bump staging vrsion
samrose Jan 30, 2025
a273d97
Merge branch 'develop' into sam/pgroonga-update
samrose Jan 30, 2025
9ceb540
Merge branch 'develop' into sam/pgroonga-update
samrose Feb 3, 2025
3432aee
chore: GRN_PLUGINS_DIR env var
samrose Feb 3, 2025
b15e36f
chore: make sure nix available
samrose Feb 3, 2025
a6d01ff
chore: no longer need sudo
samrose Feb 3, 2025
7114bca
chore: bump version
samrose Feb 3, 2025
37bd129
chore: bump upload artifact action
samrose Feb 4, 2025
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
4 changes: 3 additions & 1 deletion .github/workflows/publish-nix-pgupgrade-bin-flake-version.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,13 @@ jobs:
steps:
- name: Checkout Repo
uses: actions/checkout@v3

- uses: DeterminateSystems/nix-installer-action@main

- name: Grab release version
id: process_release_version
run: |
VERSION=$(sudo nix run nixpkgs#yq -- '.postgres_release["postgres'${{ matrix.postgres_version }}'"]' ansible/vars.yml)
VERSION=$(nix run nixpkgs#yq -- '.postgres_release["postgres'${{ matrix.postgres_version }}'"]' ansible/vars.yml)
VERSION=$(echo $VERSION | tr -d '"') # Remove any surrounding quotes
if [[ "${{ inputs.postgresVersion }}" != "" ]]; then
VERSION=${{ inputs.postgresVersion }}
Expand Down
4 changes: 2 additions & 2 deletions ansible/files/admin_api_scripts/pg_upgrade_scripts/initiate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ EOF
if [ "$IS_NIX_BASED_SYSTEM" = "true" ]; then
UPGRADE_COMMAND=". /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh && $UPGRADE_COMMAND"
fi
LC_ALL=en_US.UTF-8 LC_CTYPE=$SERVER_LC_CTYPE LC_COLLATE=$SERVER_LC_COLLATE LANGUAGE=en_US.UTF-8 LANG=en_US.UTF-8 LOCALE_ARCHIVE=/usr/lib/locale/locale-archive su -pc "$UPGRADE_COMMAND --check" -s "$SHELL" postgres
GRN_PLUGINS_DIR=/var/lib/postgresql/.nix-profile/lib/groonga/plugins LC_ALL=en_US.UTF-8 LC_CTYPE=$SERVER_LC_CTYPE LC_COLLATE=$SERVER_LC_COLLATE LANGUAGE=en_US.UTF-8 LANG=en_US.UTF-8 LOCALE_ARCHIVE=/usr/lib/locale/locale-archive su -pc "$UPGRADE_COMMAND --check" -s "$SHELL" postgres

echo "10. Stopping postgres; running pg_upgrade"
# Extra work to ensure postgres is actually stopped
Expand All @@ -435,7 +435,7 @@ EOF
CI_stop_postgres
fi

LC_ALL=en_US.UTF-8 LC_CTYPE=$SERVER_LC_CTYPE LC_COLLATE=$SERVER_LC_COLLATE LANGUAGE=en_US.UTF-8 LANG=en_US.UTF-8 LOCALE_ARCHIVE=/usr/lib/locale/locale-archive su -pc "$UPGRADE_COMMAND" -s "$SHELL" postgres
GRN_PLUGINS_DIR=/var/lib/postgresql/.nix-profile/lib/groonga/plugins LC_ALL=en_US.UTF-8 LC_CTYPE=$SERVER_LC_CTYPE LC_COLLATE=$SERVER_LC_COLLATE LANGUAGE=en_US.UTF-8 LANG=en_US.UTF-8 LOCALE_ARCHIVE=/usr/lib/locale/locale-archive su -pc "$UPGRADE_COMMAND" -s "$SHELL" postgres

# copying custom configurations
echo "11. Copying custom configurations"
Expand Down
4 changes: 2 additions & 2 deletions ansible/vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ postgres_major:

# Full version strings for each major version
postgres_release:
postgresorioledb-17: "17.0.1.030-orioledb"
postgres15: "15.8.1.034"
postgresorioledb-17: "17.0.1.024-orioledb-pgroonga-3"
postgres15: "15.8.1.034-pgroonga-3"

# Non Postgres Extensions
pgbouncer_release: "1.19.0"
Expand Down
4 changes: 2 additions & 2 deletions nix/ext/pgroonga.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ let
in
stdenv.mkDerivation rec {
pname = "pgroonga";
version = "3.0.7";
version = "3.2.5";
src = fetchurl {
url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz";
sha256 = "sha256-iF/zh4zDDpAw5fxW1WG8i2bfPt4VYsnYArwOoE/lwgM=";
sha256 = "sha256-GM9EOQty72hdE4Ecq8jpDudhZLiH3pP9ODLxs8DXcSY=";
};
nativeBuildInputs = [ pkg-config makeWrapper ];

Expand Down
23 changes: 22 additions & 1 deletion nix/tests/expected/z_15_ext_interface.out
View file
Open in desktop

Large diffs are not rendered by default.

23 changes: 22 additions & 1 deletion nix/tests/expected/z_17_ext_interface.out
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 9 additions & 1 deletion nix/tools/run-client.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,15 @@ while [[ "$#" -gt 0 ]]; do
exit 1
fi
;;
-p|--port)
if [[ -n "$2" && ! "$2" =~ ^- ]]; then
PORTNO="$2"
shift 2
else
echo "Error: --port requires an argument"
exit 1
fi
;;
-h|--help)
print_help
exit 0
Expand Down Expand Up @@ -106,7 +115,6 @@ export PATH=$BINDIR/bin:$PATH
export POSTGRES_DB=postgres
export POSTGRES_HOST=localhost

PORTNO="${2:-@PGSQL_DEFAULT_PORT@}"
PGSQL_SUPERUSER=@PGSQL_SUPERUSER@
MIGRATIONS_DIR=@MIGRATIONS_DIR@
POSTGRESQL_SCHEMA_SQL=@POSTGRESQL_SCHEMA_SQL@
Expand Down
Loading