diff --git a/.github/workflows/build-rpm/action.yaml b/.github/workflows/build-rpm/action.yaml index e9ee573..5978716 100644 --- a/.github/workflows/build-rpm/action.yaml +++ b/.github/workflows/build-rpm/action.yaml @@ -31,9 +31,9 @@ inputs: Postgres version (ex. '15.8', '16.4') cargo-pgrx-version: type: string - default: 0.11.3 + default: 0.12.5 decription: | - cargo-pgrx version (ex. '0.11.3') + cargo-pgrx version (ex. '0.12.5') user: type: string default: runner diff --git a/Cargo.toml b/Cargo.toml index c0a6d2b..c4a2ade 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,6 @@ maintenance = { status = "actively-maintained" } [features] default = ["pg16"] -pg11 = ["pgrx/pg11", "pgrx-tests/pg11"] pg12 = ["pgrx/pg12", "pgrx-tests/pg12"] pg13 = ["pgrx/pg13", "pgrx-tests/pg13"] pg14 = ["pgrx/pg14", "pgrx-tests/pg14"] @@ -32,7 +31,7 @@ getrandom = "0.2" chrono = { version = "0.4", default-features = false, features = ["clock"] } svix-ksuid = "0.8" nanoid = "0.4" -pgrx = "=0.11.3" +pgrx = "=0.12.5" pushid = "0.0.1" timeflake-rs = "0.3" ulid = { version = "1.1", features = [ "uuid" ] } @@ -41,7 +40,7 @@ xid = "1.1" time = "0.3" [dev-dependencies] -pgrx-tests = "=0.11.3" +pgrx-tests = "=0.12.5" [profile.dev] panic = "unwind" @@ -59,24 +58,6 @@ inherits = "test" [package.metadata.generate-rpm] assets = [] -[package.metadata.generate-rpm.variants.pg11] -assets = [ - { source = "/tmp/pg_idkit/rpm/scratch/pgrx-install/lib/postgresql/pg_idkit.so", dest = "/usr/lib64/pgsql/pg_idkit.so", mode = "755" }, - { source = "/tmp/pg_idkit/rpm/scratch/pgrx-install/share/postgresql/extension/pg_idkit--0.2.3.sql", dest = "/usr/share/pgsql/extension/pg_idkit--0.2.3.sql", mode = "755" }, - { source = "/tmp/pg_idkit/rpm/scratch/pgrx-install/share/postgresql/extension/pg_idkit.control", dest = "/usr/share/pgsql/extension/pg_idkit.control", mode = "755" }, -] -requires = { postgresql-server = "> 11", glibc = "*" } -release = "pg11" - -[package.metadata.generate-rpm.variants.pg12] -assets = [ - { source = "/tmp/pg_idkit/rpm/scratch/pgrx-install/lib/postgresql/pg_idkit.so", dest = "/usr/lib64/pgsql/pg_idkit.so", mode = "755" }, - { source = "/tmp/pg_idkit/rpm/scratch/pgrx-install/share/postgresql/extension/pg_idkit--0.2.3.sql", dest = "/usr/share/pgsql/extension/pg_idkit--0.2.3.sql", mode = "755" }, - { source = "/tmp/pg_idkit/rpm/scratch/pgrx-install/share/postgresql/extension/pg_idkit.control", dest = "/usr/share/pgsql/extension/pg_idkit.control", mode = "755" }, -] -requires = { postgresql-server = "> 12", glibc = "*" } -release = "pg12" - [package.metadata.generate-rpm.variants.pg13] assets = [ { source = "/tmp/pg_idkit/rpm/scratch/pgrx-install/lib/postgresql/pg_idkit.so", dest = "/usr/lib64/pgsql/pg_idkit.so", mode = "755" }, diff --git a/docs/local-development.md b/docs/local-development.md index 8b76ab3..f73da71 100644 --- a/docs/local-development.md +++ b/docs/local-development.md @@ -30,7 +30,7 @@ The PGRX project is the magic behind this extension, exposing an easy-to-program To install it: ```console -cargo install --locked cargo-pgrx@0.11.3 +cargo install --locked cargo-pgrx@0.12.5 cargo pgrx init ``` diff --git a/infra/docker/builder-gnu.Dockerfile b/infra/docker/builder-gnu.Dockerfile index 29f5e2f..2052b99 100644 --- a/infra/docker/builder-gnu.Dockerfile +++ b/infra/docker/builder-gnu.Dockerfile @@ -70,7 +70,7 @@ RUN chmod g+w -R /usr/local/sccache # Install & Initialize pgrx # NOTE: pgrx must be reinitialized if cargo-pgrx changes -RUN su idkit -c "cargo install cargo-pgrx@0.11.3" +RUN su idkit -c "cargo install cargo-pgrx@0.12.5" RUN su idkit -c "cargo pgrx init --pg15 download" # Install development/build/testing deps