Skip to content

Commit

Permalink
Adds support for pg17, fixes #51
Browse files Browse the repository at this point in the history
  • Loading branch information
pksunkara committed Sep 27, 2024
1 parent d05494e commit 7e78845
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 15 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
strategy:
fail-fast: false
matrix:
postgres: [14, 15, 16]
postgres: [14, 15, 16, 17]
runner:
- ubuntu-22.04
- buildjet-8vcpu-ubuntu-2204-arm
Expand All @@ -36,7 +36,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Install rust
uses: dtolnay/rust-toolchain@1.74.0
uses: dtolnay/rust-toolchain@1.79.0
with:
components: rustfmt, clippy
- name: Checkout
Expand All @@ -53,6 +53,6 @@ jobs:
- name: Checkout
uses: actions/checkout@v3
- name: Install rust
uses: dtolnay/rust-toolchain@1.74.0
uses: dtolnay/rust-toolchain@1.79.0
- name: Lockfile check
run: cargo update -w --locked
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
strategy:
fail-fast: false
matrix:
postgres: [14, 15, 16]
postgres: [14, 15, 16, 17]
box:
- runner: ubuntu-22.04
arch: amd64
Expand All @@ -42,7 +42,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v3
- name: Install rust
uses: dtolnay/rust-toolchain@1.74.0
uses: dtolnay/rust-toolchain@1.79.0
- name: Install dependencies
run: |
# Add postgres package repo
Expand All @@ -60,7 +60,7 @@ jobs:
# Ensure installed pg_config is first on path
export PATH=$PATH:/usr/lib/postgresql/${{ matrix.postgres }}/bin
cargo install cargo-pgrx --version 0.11.2 --locked
cargo install cargo-pgrx --version 0.12.5 --locked
cargo pgrx init --pg${{ matrix.postgres }}=/usr/lib/postgresql/${{ matrix.postgres }}/bin/pg_config
- name: Build artifacts
run: |
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

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

10 changes: 4 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,25 @@ publish = false
version = "0.1.5"

edition = "2021"
rust-version = "1.74.0"
rust-version = "1.79.0"

[lib]
crate-type = ["cdylib"]

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

[dependencies]
inner_ulid = { package = "ulid", version = "1.0.0" }
pgrx = "^0.11.2"
pgrx = "^0.12.5"

[dev-dependencies]
pgrx-tests = "^0.11.2"
pgrx-tests = "^0.12.5"

[profile.dev]
panic = "unwind"
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ RUN chown postgres:postgres /home/postgres
USER postgres

RUN \
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --profile minimal --default-toolchain 1.74.0 && \
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --profile minimal --default-toolchain 1.79.0 && \
rustup --version && \
rustc --version && \
cargo --version

# pgrx
RUN cargo install cargo-pgrx --version 0.11.2 --locked
RUN cargo install cargo-pgrx --version 0.12.5 --locked

RUN cargo pgrx init --pg${PG_MAJOR} $(which pg_config)

Expand Down

0 comments on commit 7e78845

Please sign in to comment.