centralize variables

Author: chensjlv

.github/workflows/build-and-release.yml

@@ -10,6 +10,10 @@ on:
       - release
   workflow_dispatch:
 
+env:
+  POSTGIS_VERSION: 3.4.4
+  PGROUTING_VERSION: 3.6.2
+
 jobs:
   build-and-release-macos:
     strategy:
@@ -51,7 +55,7 @@ jobs:
       - name: Build PostgreSQL, PostGIS, and Dependencies
         id: build_postgres
         run: |
-          ./build-postgres-darwin.sh -v ${{ matrix.pg_version }} -g 3.4.4 -r 3.6.2
+          ./build-postgres-darwin.sh -v ${{ matrix.pg_version }} -g $POSTGIS_VERSION -r $PGROUTING_VERSION
           if [ "${{ matrix.os }}" == "macos-15-xlarge" ]; then
             echo "ARCH=arm64" >> $GITHUB_OUTPUT
             echo "FILENAME=postgresql-${{ matrix.pg_version }}-darwin-arm64.zip" >> $GITHUB_OUTPUT

build.gradle

@@ -314,12 +314,13 @@ project(':custom-debian-platform') {
             inputs.property('archName', archName)
             inputs.property('dockerImage', dockerImage)
             inputs.property('postgisVersion', postgisVersionParam)
+            inputs.property('pgroutingVersion', pgroutingVersionParam)
 
             inputs.file("$rootDir/scripts/build-postgres-debian.sh")
             outputs.dir("$temporaryDir/bundle")
 
             workingDir temporaryDir
-            commandLine 'sh', "$rootDir/scripts/build-postgres-debian.sh", '-v', "$pgVersionParam", '-i', dockerImage, '-g', postgisVersionParam, '-o', qemuBindings
+            commandLine 'sh', "$rootDir/scripts/build-postgres-debian.sh", '-v', "$pgVersionParam", '-i', dockerImage, '-g', postgisVersionParam, '-r', pgroutingVersionParam, '-o', qemuBindings
         }
 
         task customDebianJar(group: 'build (custom)', type: Jar) {

build_and_release.sh

@@ -10,7 +10,7 @@ function do_build {
     echo "=== Building ${version} ==="
     echo
 
-    ./gradlew clean install -Pversion="${version}.0" -PpgVersion="${version}" -ParchName=amd64 -PpostgisVersion=3.4.4
+    ./gradlew clean install -Pversion="${version}.0" -PpgVersion="${version}" -ParchName=amd64 -PpostgisVersion=$POSTGIS_VERSION -PpgroutingVersion=$PGROUTING_VERSION
     cp custom-debian-platform/build/tmp/buildCustomDebianBundle/bundle/postgres-linux-debian.txz "release/postgresql-${version}-linux-amd64.txz"
 }
 

scripts/build-postgres-debian.sh

@@ -2,14 +2,19 @@
 set -ex
 
 DOCKER_OPTS=
+PROJ_VERSION=8.2.1
+GEOS_VERSION=3.8.3
+GDAL_VERSION=3.4.3
 POSTGIS_VERSION=
+PGROUTING_VERSION=
 LITE_OPT=false
 
 while getopts "v:i:g:o:l" opt; do
     case $opt in
     v) PG_VERSION=$OPTARG ;;
     i) IMG_NAME=$OPTARG ;;
     g) POSTGIS_VERSION=$OPTARG ;;
+    r) PGROUTING_VERSION=$OPTARG ;;
     o) DOCKER_OPTS=$OPTARG ;;
     l) LITE_OPT=true ;;
     \?) exit 1 ;;
@@ -36,10 +41,11 @@ docker run -i --rm -v ${TRG_DIR}:/usr/local/pg-dist \
 -e PG_VERSION=$PG_VERSION \
 -e POSTGIS_VERSION=$POSTGIS_VERSION \
 -e ICU_ENABLED=$ICU_ENABLED \
--e PROJ_VERSION=8.2.1 \
+-e PROJ_VERSION=$PROJ_VERSION \
 -e PROJ_DATUMGRID_VERSION=1.8 \
--e GEOS_VERSION=3.8.3 \
--e GDAL_VERSION=3.4.3 \
+-e GEOS_VERSION=$GEOS_VERSION \
+-e GDAL_VERSION=$GDAL_VERSION \
+-e PGROUTING_VERSION=$PGROUTING_VERSION \
 $DOCKER_OPTS $IMG_NAME /bin/bash -ex -c 'echo "Starting building postgres binaries" \
     && sed "[email protected]@us.archive.ubuntu.com@" -i /etc/apt/sources.list \
     && ln -snf /usr/share/zoneinfo/Etc/UTC /etc/localtime && echo "Etc/UTC" > /etc/timezone \
@@ -143,7 +149,7 @@ $DOCKER_OPTS $IMG_NAME /bin/bash -ex -c 'echo "Starting building postgres binari
         && make install \
       && apt-get install -y --no-install-recommends cmake libboost-graph-dev \
         && mkdir -p /usr/src/pgrouting \
-          && curl -sL "https://github.com/pgRouting/pgrouting/archive/v3.4.1.tar.gz" | tar -xzf - -C /usr/src/pgrouting --strip-components 1 \
+          && curl -sL "https://github.com/pgRouting/pgrouting/archive/v$PGROUTING_VERSION.tar.gz" | tar -xzf - -C /usr/src/pgrouting --strip-components 1 \
           && cd /usr/src/pgrouting && mkdir build && cd build \
           && cmake -DWITH_DOC=OFF -DCMAKE_INSTALL_PREFIX=/usr/local/pg-build .. \
           && make \