Parse the H3 header on the catalog path as the build path does

The catalog path of the provision-meos action and the openapi-validate workflow install libh3-dev with the other headers libclang reads, so the H3 functions keep the typedef H3Index on their uint64_t parameters and results. The build path of the action installs libh3-dev already, so both paths derive the same catalog.

Why. Without h3api.h libclang reads H3Index as uint64_t, and the catalog the action derives without build-libmeos drops the typedef from 72 H3 functions that the catalog it derives with build-libmeos states. A consumer that generates from one path and checks against the other reads a difference neither its code nor MobilityDB causes: MobilityDB/MobilityAPI-Python#19 is the case.

Measured. On MobilityDB 92c29a5fae, a catalog-path derivation in an ubuntu-24.04 container with the action's packages differs from one with libh3-dev only by the typedef H3Index on the parameters and results of 72 functions, and with libh3-dev it projects to the same MobilityAPI-Python table byte for byte as a derivation on a machine carrying libh3-dev.

Author: estebanzimanyi

.github/actions/provision-meos/action.yml

@@ -63,9 +63,10 @@ runs:
         python-version: "3.11"
 
     # libclang (Python wheel) needs the system C headers MEOS depends on so
-    # types like size_t / json_object * / GSERIALIZED * resolve to their real
-    # names instead of degrading to int / int *. Same install set as the
-    # pytest / OpenAPI-validate regenerate paths so every path agrees.
+    # types like size_t / json_object * / GSERIALIZED * / H3Index resolve to
+    # their real names instead of degrading to int / int * / uint64_t. Same
+    # install set as the OpenAPI-validate regenerate path, and the build path
+    # below installs the same headers, so every path derives the same catalog.
     # Every path installs them, so their .deb files are kept as the build path keeps its
     # own (see "Key the provision caches"): a run that restores them installs without
     # downloading, and a stalled mirror costs it only the index update.
@@ -74,7 +75,7 @@ runs:
       shell: bash
       env:
         PACKAGES: >-
-          clang libclang-dev libjson-c-dev libproj-dev
+          clang libclang-dev libjson-c-dev libproj-dev libh3-dev
       run: |
         # The PostgreSQL server headers are those of the PostgreSQL the image ships.
         packages="$PACKAGES $(bash "$GITHUB_ACTION_PATH/server-dev-package.sh")"

.github/workflows/openapi-validate.yml

@@ -37,17 +37,18 @@ jobs:
           python-version: "3.11"
 
       # libclang (Python wheel) needs the system C headers MEOS depends on
-      # so types like `size_t`, `json_object *`, `GSERIALIZED *`, … resolve
-      # to their real names instead of degrading to `int` / `int *`. Mirror
-      # the same install set as MobilityAPI's vendor-drift workflow so the
-      # two regenerate paths produce byte-identical catalogs.
+      # so types like `size_t`, `json_object *`, `GSERIALIZED *`, `H3Index`,
+      # … resolve to their real names instead of degrading to `int` /
+      # `int *` / `uint64_t`. Mirror the install set of the provision-meos
+      # action's catalog path so the two regenerate paths produce
+      # byte-identical catalogs.
       - name: Install dev headers for libclang sysroot
         run: |
           bash .github/actions/provision-meos/pgdg-source.sh
           bash .github/actions/provision-meos/apt-get.sh update -qq
           bash .github/actions/provision-meos/apt-get.sh install -y --no-install-recommends \
             clang libclang-dev \
-            libjson-c-dev libproj-dev \
+            libjson-c-dev libproj-dev libh3-dev \
             "$(bash .github/actions/provision-meos/server-dev-package.sh)"
 
       - name: Clone MobilityDB master (MEOS headers source)