diff --git a/.github/workflows/dockerhub-release-matrix.yml b/.github/workflows/dockerhub-release-matrix.yml index 378d61725..d42285cb7 100644 --- a/.github/workflows/dockerhub-release-matrix.yml +++ b/.github/workflows/dockerhub-release-matrix.yml @@ -157,7 +157,7 @@ jobs: run: | echo "${{ steps.output_version.outputs.result }}" >> results.txt # Append results - name: Upload Results Artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: merge_results-${{ matrix.version }} path: results.txt diff --git a/.github/workflows/publish-nix-pgupgrade-bin-flake-version.yml b/.github/workflows/publish-nix-pgupgrade-bin-flake-version.yml index 47bbc274d..09e1663ce 100644 --- a/.github/workflows/publish-nix-pgupgrade-bin-flake-version.yml +++ b/.github/workflows/publish-nix-pgupgrade-bin-flake-version.yml @@ -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 }} diff --git a/ansible/files/admin_api_scripts/pg_upgrade_scripts/initiate.sh b/ansible/files/admin_api_scripts/pg_upgrade_scripts/initiate.sh index 88518766b..4e11f2d52 100755 --- a/ansible/files/admin_api_scripts/pg_upgrade_scripts/initiate.sh +++ b/ansible/files/admin_api_scripts/pg_upgrade_scripts/initiate.sh @@ -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 @@ -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" diff --git a/ansible/vars.yml b/ansible/vars.yml index 009458a16..f93dd9786 100644 --- a/ansible/vars.yml +++ b/ansible/vars.yml @@ -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.31-orioledb" + postgres15: "15.8.1.035" # Non Postgres Extensions pgbouncer_release: "1.19.0" diff --git a/nix/ext/pgroonga.nix b/nix/ext/pgroonga.nix index c7fe90bb1..7ebe84960 100644 --- a/nix/ext/pgroonga.nix +++ b/nix/ext/pgroonga.nix @@ -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 ]; diff --git a/nix/tests/expected/z_15_ext_interface.out b/nix/tests/expected/z_15_ext_interface.out index 7f53984f3..9914fa3b9 100644 --- a/nix/tests/expected/z_15_ext_interface.out +++ b/nix/tests/expected/z_15_ext_interface.out @@ -1420,13 +1420,20 @@ order by pgroonga | public | pgroonga_command | groongacommand text | text pgroonga | public | pgroonga_command | groongacommand text, arguments text[] | text pgroonga | public | pgroonga_command_escape_value | value text | text + pgroonga | public | pgroonga_condition | query text, weights integer[], scorers text[], schema_name text, index_name text, column_name text, fuzzy_max_distance_ratio real | pgroonga_condition pgroonga | public | pgroonga_contain_varchar_array | character varying[], character varying | boolean pgroonga | public | pgroonga_equal_query_text_array | targets text[], query text | boolean + pgroonga | public | pgroonga_equal_query_text_array_condition | targets text[], condition pgroonga_condition | boolean + pgroonga | public | pgroonga_equal_query_text_array_condition | targets text[], condition pgroonga_full_text_search_condition | boolean pgroonga | public | pgroonga_equal_query_varchar_array | targets character varying[], query text | boolean + pgroonga | public | pgroonga_equal_query_varchar_array_condition | targets character varying[], condition pgroonga_condition | boolean + pgroonga | public | pgroonga_equal_query_varchar_array_condition | targets character varying[], condition pgroonga_full_text_search_condition | boolean pgroonga | public | pgroonga_equal_text | target text, other text | boolean pgroonga | public | pgroonga_equal_text_condition | target text, condition pgroonga_full_text_search_condition | boolean + pgroonga | public | pgroonga_equal_text_condition | target text, condition pgroonga_condition | boolean pgroonga | public | pgroonga_equal_varchar | target character varying, other character varying | boolean pgroonga | public | pgroonga_equal_varchar_condition | target character varying, condition pgroonga_full_text_search_condition | boolean + pgroonga | public | pgroonga_equal_varchar_condition | target character varying, condition pgroonga_condition | boolean pgroonga | public | pgroonga_escape | value bigint | text pgroonga | public | pgroonga_escape | value double precision | text pgroonga | public | pgroonga_escape | value text, special_characters text | text @@ -1446,6 +1453,8 @@ order by pgroonga | public | pgroonga_index_column_name | indexname cstring, columnindex integer | text pgroonga | public | pgroonga_index_column_name | indexname cstring, columnname text | text pgroonga | public | pgroonga_is_writable | | boolean + pgroonga | public | pgroonga_list_broken_indexes | | SETOF text + pgroonga | public | pgroonga_list_lagged_indexes | | SETOF text pgroonga | public | pgroonga_match_in_text | text, text[] | boolean pgroonga | public | pgroonga_match_in_text_array | text[], text[] | boolean pgroonga | public | pgroonga_match_in_varchar | character varying, character varying[] | boolean @@ -1467,11 +1476,14 @@ order by pgroonga | public | pgroonga_match_text | text, text | boolean pgroonga | public | pgroonga_match_text_array | text[], text | boolean pgroonga | public | pgroonga_match_text_array_condition | target text[], condition pgroonga_full_text_search_condition | boolean + pgroonga | public | pgroonga_match_text_array_condition | target text[], condition pgroonga_condition | boolean pgroonga | public | pgroonga_match_text_array_condition_with_scorers | target text[], condition pgroonga_full_text_search_condition_with_scorers | boolean pgroonga | public | pgroonga_match_text_condition | target text, condition pgroonga_full_text_search_condition | boolean + pgroonga | public | pgroonga_match_text_condition | target text, condition pgroonga_condition | boolean pgroonga | public | pgroonga_match_text_condition_with_scorers | target text, condition pgroonga_full_text_search_condition_with_scorers | boolean pgroonga | public | pgroonga_match_varchar | character varying, character varying | boolean pgroonga | public | pgroonga_match_varchar_condition | target character varying, condition pgroonga_full_text_search_condition | boolean + pgroonga | public | pgroonga_match_varchar_condition | target character varying, condition pgroonga_condition | boolean pgroonga | public | pgroonga_match_varchar_condition_with_scorers | target character varying, condition pgroonga_full_text_search_condition_with_scorers | boolean pgroonga | public | pgroonga_normalize | target text | text pgroonga | public | pgroonga_normalize | target text, normalizername text | text @@ -1490,10 +1502,14 @@ order by pgroonga | public | pgroonga_prefix_rk_varchar_array | character varying[], character varying | boolean pgroonga | public | pgroonga_prefix_text | text, text | boolean pgroonga | public | pgroonga_prefix_text_array | text[], text | boolean + pgroonga | public | pgroonga_prefix_text_array_condition | text[], pgroonga_condition | boolean pgroonga | public | pgroonga_prefix_text_condition | text, condition pgroonga_full_text_search_condition | boolean + pgroonga | public | pgroonga_prefix_text_condition | text, condition pgroonga_condition | boolean pgroonga | public | pgroonga_prefix_varchar | character varying, character varying | boolean pgroonga | public | pgroonga_prefix_varchar_array | character varying[], character varying | boolean + pgroonga | public | pgroonga_prefix_varchar_array_condition | character varying[], pgroonga_condition | boolean pgroonga | public | pgroonga_prefix_varchar_condition | target character varying, conditoin pgroonga_full_text_search_condition | boolean + pgroonga | public | pgroonga_prefix_varchar_condition | target character varying, conditoin pgroonga_condition | boolean pgroonga | public | pgroonga_query_escape | query text | text pgroonga | public | pgroonga_query_expand | tablename cstring, termcolumnname text, synonymscolumnname text, query text | text pgroonga | public | pgroonga_query_extract_keywords | query text, index_name text | text[] @@ -1503,16 +1519,21 @@ order by pgroonga | public | pgroonga_query_jsonb | jsonb, text | boolean pgroonga | public | pgroonga_query_text | text, text | boolean pgroonga | public | pgroonga_query_text_array | text[], text | boolean + pgroonga | public | pgroonga_query_text_array_condition | targets text[], condition pgroonga_condition | boolean pgroonga | public | pgroonga_query_text_array_condition | targets text[], condition pgroonga_full_text_search_condition | boolean pgroonga | public | pgroonga_query_text_array_condition_with_scorers | targets text[], condition pgroonga_full_text_search_condition_with_scorers | boolean pgroonga | public | pgroonga_query_text_condition | target text, condition pgroonga_full_text_search_condition | boolean + pgroonga | public | pgroonga_query_text_condition | target text, condition pgroonga_condition | boolean pgroonga | public | pgroonga_query_text_condition_with_scorers | target text, condition pgroonga_full_text_search_condition_with_scorers | boolean pgroonga | public | pgroonga_query_varchar | character varying, character varying | boolean pgroonga | public | pgroonga_query_varchar_condition | target character varying, condition pgroonga_full_text_search_condition | boolean + pgroonga | public | pgroonga_query_varchar_condition | target character varying, condition pgroonga_condition | boolean pgroonga | public | pgroonga_query_varchar_condition_with_scorers | target character varying, condition pgroonga_full_text_search_condition_with_scorers | boolean pgroonga | public | pgroonga_regexp_in_text | text, text[] | boolean pgroonga | public | pgroonga_regexp_in_varchar | character varying, character varying[] | boolean pgroonga | public | pgroonga_regexp_text | text, text | boolean + pgroonga | public | pgroonga_regexp_text_array | targets text[], pattern text | boolean + pgroonga | public | pgroonga_regexp_text_array_condition | targets text[], pattern pgroonga_condition | boolean pgroonga | public | pgroonga_regexp_varchar | character varying, character varying | boolean pgroonga | public | pgroonga_result_to_jsonb_objects | result jsonb | jsonb pgroonga | public | pgroonga_result_to_recordset | result jsonb | SETOF record @@ -5205,7 +5226,7 @@ order by xml2 | public | xpath_table | text, text, text, text, text | SETOF record xml2 | public | xslt_process | text, text | text xml2 | public | xslt_process | text, text, text | text -(5034 rows) +(5055 rows) /* diff --git a/nix/tests/expected/z_17_ext_interface.out b/nix/tests/expected/z_17_ext_interface.out index 7e2dc5fd2..37f417f81 100644 --- a/nix/tests/expected/z_17_ext_interface.out +++ b/nix/tests/expected/z_17_ext_interface.out @@ -1441,12 +1441,19 @@ order by pgroonga | public | pgroonga_command | groongacommand text | text pgroonga | public | pgroonga_command | groongacommand text, arguments text[] | text pgroonga | public | pgroonga_command_escape_value | value text | text + pgroonga | public | pgroonga_condition | query text, weights integer[], scorers text[], schema_name text, index_name text, column_name text, fuzzy_max_distance_ratio real | pgroonga_condition pgroonga | public | pgroonga_contain_varchar_array | character varying[], character varying | boolean pgroonga | public | pgroonga_equal_query_text_array | targets text[], query text | boolean + pgroonga | public | pgroonga_equal_query_text_array_condition | targets text[], condition pgroonga_condition | boolean + pgroonga | public | pgroonga_equal_query_text_array_condition | targets text[], condition pgroonga_full_text_search_condition | boolean pgroonga | public | pgroonga_equal_query_varchar_array | targets character varying[], query text | boolean + pgroonga | public | pgroonga_equal_query_varchar_array_condition | targets character varying[], condition pgroonga_condition | boolean + pgroonga | public | pgroonga_equal_query_varchar_array_condition | targets character varying[], condition pgroonga_full_text_search_condition | boolean pgroonga | public | pgroonga_equal_text | target text, other text | boolean + pgroonga | public | pgroonga_equal_text_condition | target text, condition pgroonga_condition | boolean pgroonga | public | pgroonga_equal_text_condition | target text, condition pgroonga_full_text_search_condition | boolean pgroonga | public | pgroonga_equal_varchar | target character varying, other character varying | boolean + pgroonga | public | pgroonga_equal_varchar_condition | target character varying, condition pgroonga_condition | boolean pgroonga | public | pgroonga_equal_varchar_condition | target character varying, condition pgroonga_full_text_search_condition | boolean pgroonga | public | pgroonga_escape | value bigint | text pgroonga | public | pgroonga_escape | value boolean | text @@ -1467,6 +1474,8 @@ order by pgroonga | public | pgroonga_index_column_name | indexname cstring, columnindex integer | text pgroonga | public | pgroonga_index_column_name | indexname cstring, columnname text | text pgroonga | public | pgroonga_is_writable | | boolean + pgroonga | public | pgroonga_list_broken_indexes | | SETOF text + pgroonga | public | pgroonga_list_lagged_indexes | | SETOF text pgroonga | public | pgroonga_match_in_text | text, text[] | boolean pgroonga | public | pgroonga_match_in_text_array | text[], text[] | boolean pgroonga | public | pgroonga_match_in_varchar | character varying, character varying[] | boolean @@ -1487,11 +1496,14 @@ order by pgroonga | public | pgroonga_match_term | target text[], term text | boolean pgroonga | public | pgroonga_match_text | text, text | boolean pgroonga | public | pgroonga_match_text_array | text[], text | boolean + pgroonga | public | pgroonga_match_text_array_condition | target text[], condition pgroonga_condition | boolean pgroonga | public | pgroonga_match_text_array_condition | target text[], condition pgroonga_full_text_search_condition | boolean pgroonga | public | pgroonga_match_text_array_condition_with_scorers | target text[], condition pgroonga_full_text_search_condition_with_scorers | boolean + pgroonga | public | pgroonga_match_text_condition | target text, condition pgroonga_condition | boolean pgroonga | public | pgroonga_match_text_condition | target text, condition pgroonga_full_text_search_condition | boolean pgroonga | public | pgroonga_match_text_condition_with_scorers | target text, condition pgroonga_full_text_search_condition_with_scorers | boolean pgroonga | public | pgroonga_match_varchar | character varying, character varying | boolean + pgroonga | public | pgroonga_match_varchar_condition | target character varying, condition pgroonga_condition | boolean pgroonga | public | pgroonga_match_varchar_condition | target character varying, condition pgroonga_full_text_search_condition | boolean pgroonga | public | pgroonga_match_varchar_condition_with_scorers | target character varying, condition pgroonga_full_text_search_condition_with_scorers | boolean pgroonga | public | pgroonga_normalize | target text | text @@ -1511,9 +1523,13 @@ order by pgroonga | public | pgroonga_prefix_rk_varchar_array | character varying[], character varying | boolean pgroonga | public | pgroonga_prefix_text | text, text | boolean pgroonga | public | pgroonga_prefix_text_array | text[], text | boolean + pgroonga | public | pgroonga_prefix_text_array_condition | text[], pgroonga_condition | boolean + pgroonga | public | pgroonga_prefix_text_condition | text, condition pgroonga_condition | boolean pgroonga | public | pgroonga_prefix_text_condition | text, condition pgroonga_full_text_search_condition | boolean pgroonga | public | pgroonga_prefix_varchar | character varying, character varying | boolean pgroonga | public | pgroonga_prefix_varchar_array | character varying[], character varying | boolean + pgroonga | public | pgroonga_prefix_varchar_array_condition | character varying[], pgroonga_condition | boolean + pgroonga | public | pgroonga_prefix_varchar_condition | target character varying, conditoin pgroonga_condition | boolean pgroonga | public | pgroonga_prefix_varchar_condition | target character varying, conditoin pgroonga_full_text_search_condition | boolean pgroonga | public | pgroonga_query_escape | query text | text pgroonga | public | pgroonga_query_expand | tablename cstring, termcolumnname text, synonymscolumnname text, query text | text @@ -1524,16 +1540,21 @@ order by pgroonga | public | pgroonga_query_jsonb | jsonb, text | boolean pgroonga | public | pgroonga_query_text | text, text | boolean pgroonga | public | pgroonga_query_text_array | text[], text | boolean + pgroonga | public | pgroonga_query_text_array_condition | targets text[], condition pgroonga_condition | boolean pgroonga | public | pgroonga_query_text_array_condition | targets text[], condition pgroonga_full_text_search_condition | boolean pgroonga | public | pgroonga_query_text_array_condition_with_scorers | targets text[], condition pgroonga_full_text_search_condition_with_scorers | boolean + pgroonga | public | pgroonga_query_text_condition | target text, condition pgroonga_condition | boolean pgroonga | public | pgroonga_query_text_condition | target text, condition pgroonga_full_text_search_condition | boolean pgroonga | public | pgroonga_query_text_condition_with_scorers | target text, condition pgroonga_full_text_search_condition_with_scorers | boolean pgroonga | public | pgroonga_query_varchar | character varying, character varying | boolean + pgroonga | public | pgroonga_query_varchar_condition | target character varying, condition pgroonga_condition | boolean pgroonga | public | pgroonga_query_varchar_condition | target character varying, condition pgroonga_full_text_search_condition | boolean pgroonga | public | pgroonga_query_varchar_condition_with_scorers | target character varying, condition pgroonga_full_text_search_condition_with_scorers | boolean pgroonga | public | pgroonga_regexp_in_text | text, text[] | boolean pgroonga | public | pgroonga_regexp_in_varchar | character varying, character varying[] | boolean pgroonga | public | pgroonga_regexp_text | text, text | boolean + pgroonga | public | pgroonga_regexp_text_array | targets text[], pattern text | boolean + pgroonga | public | pgroonga_regexp_text_array_condition | targets text[], pattern pgroonga_condition | boolean pgroonga | public | pgroonga_regexp_varchar | character varying, character varying | boolean pgroonga | public | pgroonga_result_to_jsonb_objects | result jsonb | jsonb pgroonga | public | pgroonga_result_to_recordset | result jsonb | SETOF record @@ -4885,7 +4906,7 @@ order by xml2 | public | xpath_table | text, text, text, text, text | SETOF record xml2 | public | xslt_process | text, text | text xml2 | public | xslt_process | text, text, text | text -(4726 rows) +(4747 rows) /* diff --git a/nix/tools/run-client.sh.in b/nix/tools/run-client.sh.in index 125e365bd..ef81d58c1 100644 --- a/nix/tools/run-client.sh.in +++ b/nix/tools/run-client.sh.in @@ -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 @@ -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@