Skip to content

Update to support Postgres 17 #10

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

Merged
merged 2 commits into from
May 25, 2025
Merged

Update to support Postgres 17 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
557d393
Update to support Postgres 17
rustprooflabs May 21, 2025
cd62609
Update gitignore
rustprooflabs May 25, 2025
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
*.iml
**/*.rs.bk
Cargo.lock
build/*.tar.gz
8 changes: 4 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ edition = "2021"
crate-type = ["cdylib", "lib"]

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

[dependencies]
pgrx = "=0.12.0-alpha.1"
pgrx = "=0.14.1"

[dev-dependencies]
pgrx-tests = "=0.12.0-alpha.1"
pgrx-tests = "=0.14.1"

[profile.dev]
panic = "unwind"
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2022-2024 Ryan Lambert, RustProof Labs
Copyright (c) 2022-2025 Ryan Lambert, RustProof Labs

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
8 changes: 4 additions & 4 deletions build/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Based on PgDD https://github.com/rustprooflabs/pgdd/tree/main/build
# which was original based on ZomboDB's system.
#
# Copyright 2023-2024 RustProof Labs
# Copyright 2023-2025 RustProof Labs
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -22,10 +22,10 @@ BASE=$(dirname `pwd`)
VERSION=$(cat $BASE/convert.control | grep default_version | cut -f2 -d\')
LOGDIR=${BASE}/target/logs
ARTIFACTDIR=${BASE}/target/artifacts
PGRXVERSION=0.12.0-alpha.1
PGRXVERSION=0.14.1

#PG_VERS=("pg12" "pg13" "pg14" "pg15" "pg16")
PG_VERS=("pg16")
PG_VERS=("pg13" "pg14" "pg15" "pg16" "pg17")
#PG_VERS=("pg17")

echo $BASE
echo $VERSION
Expand Down
4 changes: 2 additions & 2 deletions build/docker/convert-debian-postgis/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Uses the PostGIS image used by PgOSM Flex. At time of writing
# it was Debian 11 (bullseye)
FROM postgis/postgis:16-3.4
FROM postgis/postgis:17-3.5

LABEL maintainer="Convert Project - https://github.com/rustprooflabs/convert"

Expand All @@ -27,11 +27,11 @@ RUN apt-get install -y --fix-missing \
libldap-dev libkrb5-dev gettext tcl-tclreadline tcl-dev libperl-dev \
libpython3-dev libprotobuf-c-dev libprotobuf-dev gcc \
ruby ruby-dev rubygems \
postgresql-12 postgresql-server-dev-12 \
postgresql-13 postgresql-server-dev-13 \
postgresql-14 postgresql-server-dev-14 \
postgresql-15 postgresql-server-dev-15 \
postgresql-16 postgresql-server-dev-16 \
postgresql-17 postgresql-server-dev-17 \
&& apt autoremove -y


Expand Down