Skip to content
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

Jump to bottom

update paradedb extensions #761

Merged
merged 5 commits into from
Sep 22, 2024
Merged

update paradedb extensions #761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7f99e9c
update pg_search
ChuckHend Sep 20, 2024
f8d2438
update pg_analytics
ChuckHend Sep 20, 2024
009b0ea
Merge branch 'main' into pdb
ChuckHend Sep 20, 2024
12a73fa
update pgrx ver in pg_analytics build
ChuckHend Sep 20, 2024
cb00c2d
Merge branch 'pdb' of github.com:tembo-io/trunk into pdb
ChuckHend Sep 20, 2024
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
10 changes: 6 additions & 4 deletions contrib/pg_analytics/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG PG_VERSION=15
FROM quay.io/coredb/pgrx-builder:pg${PG_VERSION}-pgrx0.12.1
FROM quay.io/coredb/pgrx-builder:pg${PG_VERSION}-pgrx0.12.4
USER root

RUN apt-get update && apt-get install -y \
Expand All @@ -17,12 +17,14 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
# Clone repository
RUN git clone https://github.com/paradedb/pg_analytics

ARG PG_ANALYTICS_VERSION=v0.1.2
# argument passed in during build and defined in Trunk.toml
ARG EXTENSION_VERSION

ARG PG_VERSION=15

# Build extension
RUN cd pg_analytics && \
git fetch origin ${PG_ANALYTICS_VERSION} && \
git checkout ${PG_ANALYTICS_VERSION} && \
git fetch origin v${EXTENSION_VERSION} && \
git checkout v${EXTENSION_VERSION} && \
cargo pgrx init --pg${PG_VERSION} /usr/bin/pg_config && \
cargo pgrx package
2 changes: 1 addition & 1 deletion contrib/pg_analytics/Trunk.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[extension]
name = "pg_analytics"
version = "0.1.2"
version = "0.1.4"
repository = "https://github.com/paradedb/pg_analytics"
license = "AGPL-3.0"
description = "pg_analytics (formerly named pg_lakehouse) puts DuckDB inside Postgres"
Expand Down
14 changes: 6 additions & 8 deletions contrib/pg_search/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
ARG PG_VERSION=15
FROM quay.io/coredb/pgrx-builder:pg${PG_VERSION}-pgrx0.12.1
FROM quay.io/coredb/pgrx-builder:pg${PG_VERSION}-pgrx0.12.4
USER root

ARG RELEASE=v0.9.4

# Extension build dependencies
RUN apt-get update && apt-get install -y \
build-essential
Expand All @@ -15,17 +13,17 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
RUN /root/.cargo/bin/rustup default 1.80.0-x86_64-unknown-linux-gnu
ARG PG_VERSION=15

# argument passed in during build and defined in Trunk.toml
ARG EXTENSION_VERSION

# Clone repository
RUN git clone https://github.com/paradedb/paradedb.git && \
cd paradedb && \
git fetch --tags && \
git fetch --depth 1 origin tag ${RELEASE} && \
git checkout ${RELEASE}

git fetch --depth 1 origin tag v${EXTENSION_VERSION} && \
git checkout v${EXTENSION_VERSION}

# Build the extension
RUN cd paradedb && \
cd pg_search && \
RUN cd paradedb/pg_search && \
cargo pgrx init --pg${PG_VERSION} /usr/bin/pg_config && \
cargo pgrx package
2 changes: 1 addition & 1 deletion contrib/pg_search/Trunk.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[extension]
name = "pg_search"
version = "0.9.4"
version = "0.10.0"
repository = "https://github.com/paradedb/paradedb/tree/dev/pg_search"
license = "AGPL-3.0"
description = "Full text search over heap tables using the BM25 algorithm."
Expand Down