diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f33b92a..1f5c23a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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 @@ -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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 28d1e7e..010abe7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 @@ -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 @@ -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: | diff --git a/Cargo.lock b/Cargo.lock index cf3be84..8527a1e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1714,7 +1714,7 @@ checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" [[package]] name = "ulid" -version = "0.1.4" +version = "0.1.5" dependencies = [ "pgrx", "pgrx-tests", diff --git a/Cargo.toml b/Cargo.toml index b050e41..87b4b4a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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" diff --git a/Dockerfile b/Dockerfile index a606b73..f05e835 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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)