fixes && updates

.circleci/config.yml

@@ -5,7 +5,10 @@ version: 2.1
 
 orbs:
   # https://circleci.com/developer/orbs/orb/circleci/docker
-  docker: circleci/docker@2.2.0
+  docker: circleci/docker@2.4.0
+  # https://circleci.com/developer/orbs/orb/circleci/python
+  python: circleci/python@2.1.1
+
 
 jobs:
   build-arm64:
@@ -24,6 +27,15 @@ jobs:
       - run: uname -a
       - run: docker --version
       - run: docker info
+      - run:
+          name: Install manifest-tool (linux-arm64 )
+          command: |
+            wget https://github.com/estesp/manifest-tool/releases/download/v2.0.8/binaries-manifest-tool-2.0.8.tar.gz
+            mkdir manifest-tool
+            tar -xvzf binaries-manifest-tool-2.0.8.tar.gz -C manifest-tool
+            sudo mv manifest-tool/manifest-tool-linux-arm64 /usr/local/bin/manifest-tool
+            manifest-tool -v
+      - run: pip3 install lastversion
       - run: source tools/environment_init.sh
       - run: make check_version
       - docker/check:
@@ -53,15 +65,6 @@ jobs:
               circleci-agent step halt
             fi
 
-      - run:
-          name: Install manifest-tool (linux-arm64 )
-          command: |
-            wget https://github.com/estesp/manifest-tool/releases/download/v2.0.8/binaries-manifest-tool-2.0.8.tar.gz
-            mkdir manifest-tool
-            tar -xvzf binaries-manifest-tool-2.0.8.tar.gz -C manifest-tool
-            sudo mv manifest-tool/manifest-tool-linux-arm64 /usr/local/bin/manifest-tool
-            manifest-tool -v
-
       - run:
           name: "Push docker image : make push-<< parameters.target-version-variant >>"
           command: |

.github/workflows/localtest.yml

@@ -13,5 +13,13 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - run: docker ps -a
+      - name: Install manifest-tool
+        run: |
+              wget https://github.com/estesp/manifest-tool/releases/download/v2.0.8/binaries-manifest-tool-2.0.8.tar.gz
+              mkdir manifest-tool
+              tar -xvzf binaries-manifest-tool-2.0.8.tar.gz -C manifest-tool
+              sudo mv manifest-tool/manifest-tool-linux-amd64 /usr/local/bin/manifest-tool
+              manifest-tool -v
+      - run: pip install lastversion
       - run: ./localtest.sh
       - run: docker images

Dockerfile.alpine.template

@@ -49,9 +49,8 @@ RUN set -eux \
         \
         autoconf \
         automake \
+        bison \
         cunit-dev \
-        docbook-xml \
-        docbook5-xml \
         file \
         g++ \
         gcc \
@@ -136,7 +135,8 @@ RUN set -eux \
 # clean
     && cd / \
     && rm -rf /usr/src/postgis \
-    && apk del .fetch-deps .build-deps \
+    && apk del .build-deps \
+    #&& apk del .fetch-deps \
 # At the end of the build, we print the collected information
 # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes.
     && cat /_pgis_full_version.txt

versions.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# shellcheck disable=SC2154
 set -Eeuo pipefail
 
 # Source environment variables and necessary configurations
@@ -155,14 +156,14 @@ get_latest_version_and_hash() {
     local repo_url=$1
     # Argument 2: Repository identifier
     local repo_id=$2
-    echo "[+] Checking lastversion : $repo_id  - $repo_url"  
+    echo "[+] Checking lastversion : $repo_id  - $repo_url"
     # Fetch the latest version tag using the lastversion command
     eval "lastversion_${repo_id}=$(lastversion --format tag --pre "${repo_url}")"
-    
+
     # Intermediary step to resolve the variable name
     local var_name="lastversion_${repo_id}"
     local last_version=${!var_name}
-    
+
     # Fetch the SHA1 hash of the tag using the get_tag_hash function
     eval "lastversion_${repo_id}_sha1=$(get_tag_hash "${repo_url}" "${last_version}")"
 
@@ -176,16 +177,16 @@ get_latest_version_and_hash() {
 }
 
 get_latest_version_and_hash "https://github.com/MobilityDB/MobilityDB" "mobilitydb"
-get_latest_version_and_hash "https://github.com/pramsey/pgsql-http"    "pgsql_http"
-get_latest_version_and_hash "https://github.com/pramsey/pgsql-gzip"    "pgsql_gzip"
+get_latest_version_and_hash "https://github.com/pramsey/pgsql-http" "pgsql_http"
+get_latest_version_and_hash "https://github.com/pramsey/pgsql-gzip" "pgsql_gzip"
 get_latest_version_and_hash "https://github.com/timescale/timescaledb" "timescaledb"
 
-get_latest_version_and_hash "https://github.com/postgis/postgis"       "postgis"
-get_latest_version_and_hash "https://github.com/CGAL/cgal"             "cgal"
-get_latest_version_and_hash "https://github.com/libgeos/geos"          "geos"
-get_latest_version_and_hash "https://github.com/OSGeo/gdal"            "gdal"
-get_latest_version_and_hash "https://github.com/OSGeo/PROJ"            "proj"
-get_latest_version_and_hash "https://gitlab.com/Oslandia/SFCGAL"       "sfcgal"
+get_latest_version_and_hash "https://github.com/postgis/postgis" "postgis"
+get_latest_version_and_hash "https://github.com/CGAL/cgal" "cgal"
+get_latest_version_and_hash "https://github.com/libgeos/geos" "geos"
+get_latest_version_and_hash "https://github.com/OSGeo/gdal" "gdal"
+get_latest_version_and_hash "https://github.com/OSGeo/PROJ" "proj"
+get_latest_version_and_hash "https://gitlab.com/Oslandia/SFCGAL" "sfcgal"
 
 #-------------------------------------------