From 9da0867618eb69e5fdf1cc282cae0590ac52e80b Mon Sep 17 00:00:00 2001
From: Zacharias Knudsen <z@chari.as>
Date: Mon, 19 Sep 2022 12:18:56 +0200
Subject: [PATCH] Make sure pgxn works with two separate extensions

---
 .github/docker/entrypoint.sh |  1 +
 .github/docker/tools.sh      | 22 ++++++++++++++++++++--
 META.json                    |  8 +++++++-
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/.github/docker/entrypoint.sh b/.github/docker/entrypoint.sh
index ad081df1..e8665448 100755
--- a/.github/docker/entrypoint.sh
+++ b/.github/docker/entrypoint.sh
@@ -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"
diff --git a/.github/docker/tools.sh b/.github/docker/tools.sh
index 8d0482c4..02bd3906 100755
--- a/.github/docker/tools.sh
+++ b/.github/docker/tools.sh
@@ -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)
@@ -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
diff --git a/META.json b/META.json
index fe77987f..c012f80b 100644
--- a/META.json
+++ b/META.json
@@ -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"
     }