Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 5 additions & 17 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ jobs:
export PATH="$INSTALL_BIN:$HOME/.cargo/bin:/opt/homebrew/opt/ccache/bin:$PATH"
export LDFLAGS="-L/opt/homebrew/lib -lssl -lcrypto"
export IS_MUSL=0
cargo install cargo-pgrx --version 0.12.5 --locked
cargo install cargo-pgrx --version 0.16.1 --locked
elif [ "${{ matrix.os }}" = "windows-2022" ]; then
export PATH="$INSTALL_BIN:$USERPROFILE/.cargo/bin:C:\ProgramData\chocolatey\lib\ccache\tools\ccache-${{ matrix.arch }}-windows:$PATH"
export IS_MUSL=0
Expand All @@ -146,22 +146,14 @@ jobs:
CIBW_BEFORE_ALL_WINDOWS: |
choco install llvm cmake ninja
export IS_MUSL=0
# Build base extensions with cargo-pgrx 0.12.5
cargo install cargo-pgrx --version 0.12.5 --locked
make
# Remove cargo-pgrx 0.12.5 and install 0.16.1 for pg_search
cargo uninstall cargo-pgrx || true
cargo install cargo-pgrx --version 0.16.1 --locked
make
make EXTENSIONS=pg_search
CIBW_BEFORE_ALL_MACOS: |
brew install jq llvm cmake ninja lz4 openssl
export IS_MUSL=0
# Build base extensions with cargo-pgrx 0.12.5
cargo install cargo-pgrx --version 0.12.5 --locked
make
# Switch to cargo-pgrx 0.16.1 for pg_search
cargo uninstall cargo-pgrx || true
cargo install cargo-pgrx --version 0.16.1 --locked
make
make EXTENSIONS=pg_search
CIBW_BEFORE_ALL_LINUX: |
set -e
Expand All @@ -179,8 +171,7 @@ jobs:
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.88.0
export PATH="$HOME/.cargo/bin:/usr/lib/ccache:$PATH"
rustup default 1.88.0
# Build base extensions with cargo-pgrx 0.12.5
cargo install cargo-pgrx --version 0.12.5 --locked
cargo install cargo-pgrx --version 0.16.1 --locked
if command -v ldd &> /dev/null && ldd --version 2>&1 | grep -qi musl; then
export IS_MUSL=1
else
Expand All @@ -191,17 +182,14 @@ jobs:
fi
make
if [ "$IS_MUSL" != "1" ]; then
# Remove cargo-pgrx 0.12.5 and install 0.16.1 for pg_search
cargo uninstall cargo-pgrx || true
cargo install cargo-pgrx --version 0.16.1 --locked
make EXTENSIONS=pg_search
else
echo "Skipping pg_search build on musl libc"
fi
CIBW_ENVIRONMENT_LINUX: PATH="$HOME/.cargo/bin:$PATH:/project/src/pgembed/pginstall/bin"
CIBW_ENVIRONMENT_MUSLLINUX: LIBCLANG_STATIC_PATH=/usr/lib
CIBW_ENVIRONMENT_MANYLINUX: LIBCLANG_PATH=/usr/lib64
CIBW_ENVIRONMENT_MACOS: PATH="$PWD/src/pgembed/pginstall/bin:$HOME/.cargo/bin:/opt/homebrew/opt/ccache/bin:$PATH" LIBCLANG_PATH="/opt/homebrew/opt/llvm/lib" LDFLAGS="-L/opt/homebrew/lib -lssl -lcrypto" MACOSX_DEPLOYMENT_TARGET=15.0
CIBW_ENVIRONMENT_MACOS: PATH="$PWD/src/pgembed/pginstall/bin:$HOME/.cargo/bin:/opt/homebrew/opt/ccache/bin:$PATH" LDFLAGS="-L/opt/homebrew/lib -lssl -lcrypto" MACOSX_DEPLOYMENT_TARGET=15.0 BINDGEN_EXTRA_CLANG_ARGS="$(pg_config --cppflags) -I$(xcrun --show-sdk-path)/usr/include -I/opt/homebrew/include"
CIBW_TEST_COMMAND_WINDOWS: true # Tests disabled pending issues with executing binaries built
CIBW_ENVIRONMENT_WINDOWS: PATH="$PWD\\src\\pgembed\\pginstall\\bin;$USERPROFILE\\.cargo\\bin;C:\\ProgramData\\chocolatey\\lib\\ccache\\tools\\ccache-AMD64-windows;$PATH" LIBCLANG_PATH="C:\\Program Files\\LLVM\\bin"
MACOSX_DEPLOYMENT_TARGET: ${{ matrix.deployment-target }}
Expand Down
8 changes: 4 additions & 4 deletions pgbuild/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ $(INSTALL_PREFIX)/bin/postgres: $(POSTGRES_BLD)/config.status
postgres: $(INSTALL_PREFIX)/bin/postgres

### pgvector
PGVECTOR_TAG := v0.8.1
PGVECTOR_TAG := v0.8.2
PGVECTOR_URL := https://github.com/pgvector/pgvector/archive/refs/tags/$(PGVECTOR_TAG).tar.gz
PGVECTOR_DIR := pgvector-$(PGVECTOR_TAG)

Expand Down Expand Up @@ -116,7 +116,7 @@ else
endif

### pgvectorscale
PGVECTORSCALE_TAG := 0.5.1
PGVECTORSCALE_TAG := 0.9.0
PGVECTORSCALE_URL := https://github.com/timescale/pgvectorscale/archive/refs/tags/$(PGVECTORSCALE_TAG).tar.gz
PGVECTORSCALE_DIR := pgvectorscale-$(PGVECTORSCALE_TAG)

Expand All @@ -142,7 +142,7 @@ else
endif

### pgtextsearch
PGTEXTSEARCH_TAG := v0.5.0
PGTEXTSEARCH_TAG := v0.6.1
PGTEXTSEARCH_URL := https://github.com/timescale/pg_textsearch/archive/refs/tags/$(PGTEXTSEARCH_TAG).tar.gz
PGTEXTSEARCH_DIR := pgtextsearch-$(PGTEXTSEARCH_TAG)

Expand All @@ -166,7 +166,7 @@ else
endif

### pg_search
PGSEARCH_TAG ?= v0.21.10
PGSEARCH_TAG ?= v0.21.14
PGSEARCH_URL := https://github.com/paradedb/paradedb/archive/refs/tags/$(PGSEARCH_TAG).tar.gz
PGSEARCH_DIR := paradedb-$(PGSEARCH_TAG)
PGSEARCH_SUBDIR := $(PGSEARCH_DIR)/pg_search
Expand Down
Loading