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
3 changes: 1 addition & 2 deletions .ci/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '3'
services:

test:
Expand All @@ -7,6 +6,6 @@ services:
context: ..
dockerfile: ./dockerfiles/db/Dockerfile
args:
PG_VERSION: ${PG_VERSION:-15}
PG_VERSION: ${PG_VERSION:-18}
command:
- ./bin/installcheck
14 changes: 7 additions & 7 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ jobs:
sudo apt-get install -y --no-install-recommends clang libclang-dev gcc tree

# Install requested postgres version
sudo apt install -y postgresql-16 postgresql-server-dev-16 -y
sudo apt install -y postgresql-18 postgresql-server-dev-18 -y

# Ensure installed pg_config is first on path
export PATH=$PATH:/usr/lib/postgresql/16/bin
export PATH=$PATH:/usr/lib/postgresql/18/bin

curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --profile minimal --default-toolchain stable && \
rustup --version && \
Expand All @@ -43,17 +43,17 @@ jobs:

rustup component add llvm-tools-preview
cargo install cargo-llvm-cov
cargo install cargo-pgrx --version 0.16.0 --locked
cargo pgrx init --pg16=/usr/lib/postgresql/16/bin/pg_config
cargo install cargo-pgrx --version 0.16.1 --locked
cargo pgrx init --pg18=/usr/lib/postgresql/18/bin/pg_config

sudo chmod a+rw /usr/share/postgresql/16/extension
sudo chmod a+rw /usr/lib/postgresql/16/lib/
sudo chmod a+rw /usr/share/postgresql/18/extension
sudo chmod a+rw /usr/lib/postgresql/18/lib/

cargo pgrx install
source <(cargo llvm-cov show-env --export-prefix)
cargo llvm-cov clean --workspace
cargo build
cp ./target/debug/libpg_graphql.so /usr/lib/postgresql/16/lib/pg_graphql.so
cp ./target/debug/libpg_graphql.so /usr/lib/postgresql/18/lib/pg_graphql.so
./bin/installcheck
cargo llvm-cov report --lcov --output-path lcov.info

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ jobs:
package_name:
- pg-graphql
pgrx_version:
- 0.16.0
postgres: [14, 15, 16, 17]
- 0.16.1
postgres: [14, 15, 16, 17, 18]
box:
- { runner: ubuntu-latest, arch: amd64 }
- { runner: u22-arm-runner, arch: arm64 }
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
name: Run tests
strategy:
matrix:
postgres: [14, 15, 16, 17]
postgres: [14, 15, 16, 17, 18]
runs-on: ubuntu-latest
steps:
- name: Checkout code
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,8 @@ perf.txt
query.txt
schema.graphql
target/

# Ignore aider AI tool internal files, and keep any config.
.aider*
!.aider.conf.yml
!.aiderignore.aider*
130 changes: 19 additions & 111 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,16 @@ name = "pgrx_embed_pg_graphql"
path = "./src/bin/pgrx_embed.rs"

[features]
default = ["pg16"]
default = ["pg18"]
pg14 = ["pgrx/pg14", "pgrx-tests/pg14"]
pg15 = ["pgrx/pg15", "pgrx-tests/pg15"]
pg16 = ["pgrx/pg16", "pgrx-tests/pg16"]
pg17 = ["pgrx/pg17", "pgrx-tests/pg17"]
pg18 = ["pgrx/pg18", "pgrx-tests/pg18"]
pg_test = []

[dependencies]
pgrx = "=0.16.0"
pgrx = "=0.16.1"
graphql-parser = "0.4"
serde = { version = "1.0", features = ["rc"] }
serde_json = "1.0"
Expand All @@ -36,7 +37,7 @@ indexmap = "2.2"
thiserror = "2.0"

[dev-dependencies]
pgrx-tests = "=0.16.0"
pgrx-tests = "=0.16.1"

[profile.dev]
panic = "unwind"
Expand Down
Loading