Skip to content

Commit

Permalink
Make sure pgxn works with two separate extensions
Browse files Browse the repository at this point in the history
  • Loading branch information
zachasme committed Sep 19, 2022
1 parent 1006ad7 commit 9da0867
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 3 deletions.
1 change: 1 addition & 0 deletions .github/docker/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ if [ -z "$DISTRIBUTION" ]; then
su postgres -p -c "make ci"
su postgres -p -c "make installcheck"
else
su postgres -p -c "psql -c 'CREATE EXTENSION postgis'"
pgxn install $DISTRIBUTION
su postgres -p -c "pgxn load $DISTRIBUTION"
su postgres -p -c "pgxn check $DISTRIBUTION"
Expand Down
22 changes: 20 additions & 2 deletions .github/docker/tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Commands
exit 0;
}

while getopts ':hbpta::u::g::' o; do
while getopts ':hbptia::u::g::' o; do
case "${o}" in
a) # set arch
ARCHS=($OPTARG)
Expand Down Expand Up @@ -90,7 +90,25 @@ case "${o}" in
done
;;

*) # print help
i) # try pgxnclient install
work=pgxn
for postgresql in "${POSTGRESQLS[@]}"; do
for ubuntu in "${UBUNTUS[@]}"; do
for arch in "${ARCHS[@]}"; do
echo "=============================="
echo "$postgresql-$ubuntu-$arch"
docker run \
--rm \
--platform linux/$arch \
-v "$PWD"/../..:/github/workspace \
$REPOSITORY/test:$postgresql-$ubuntu-$arch \
"./h3-unreleased.zip"
done
done
done
;;

*) # print help
printhelp
exit 1;;
esac
Expand Down
8 changes: 7 additions & 1 deletion META.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,13 @@
"provides": {
"h3": {
"abstract": "PostgreSQL bindings for H3",
"file": "sql/h3--unreleased.sql",
"file": "h3--unreleased.sql",
"docfile": "README.md",
"version": "unreleased"
},
"h3_postgis": {
"abstract": "H3 PostGIS integration",
"file": "h3_postgis--unreleased.sql",
"docfile": "README.md",
"version": "unreleased"
}
Expand Down

0 comments on commit 9da0867

Please sign in to comment.