From ab6f2096b68fa9c4831044ab09a680f771ca61b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Bartoletti?= Date: Tue, 7 Nov 2023 04:37:41 +0100 Subject: [PATCH] [SFCGAL] bump hash and use new gitlab url (#364) * [SFCGAL] bump hash and use new gitlab url * run update.sh --------- Co-authored-by: ImreSamu --- 15-master/Dockerfile | 24 ++++++++++++------------ 16-master/Dockerfile | 24 ++++++++++++------------ Dockerfile.master.template | 2 +- update.sh | 2 +- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/15-master/Dockerfile b/15-master/Dockerfile index 8a20da1b..bec3243f 100644 --- a/15-master/Dockerfile +++ b/15-master/Dockerfile @@ -88,8 +88,8 @@ ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} # one can benefit from the latest CGAL patches while avoiding compatibility issues. ARG CGAL_GIT_BRANCH ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH} -ENV CGAL5X_GIT_HASH 3c8e2053721271119499506ea1d8a49dee89e30c -ENV SFCGAL_GIT_HASH fc4dc5640e402c8b00426b5a3562324226725df9 +ENV CGAL5X_GIT_HASH 08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9 +ENV SFCGAL_GIT_HASH cbcf0adaa6cecc80347345952b5c850a64d2db4f RUN set -ex \ && mkdir -p /usr/src \ && cd /usr/src \ @@ -98,7 +98,7 @@ RUN set -ex \ && git checkout ${CGAL5X_GIT_HASH} \ && git log -1 > /_pgis_cgal_last_commit.txt \ && cd /usr/src \ - && git clone https://gitlab.com/Oslandia/SFCGAL.git \ + && git clone https://gitlab.com/SFCGAL/SFCGAL.git \ && cd SFCGAL \ && git checkout ${SFCGAL_GIT_HASH} \ && git log -1 > /_pgis_sfcgal_last_commit.txt \ @@ -122,7 +122,7 @@ RUN set -ex \ && rm -fr /usr/src/cgal # proj -ENV PROJ_GIT_HASH d4ebd920c1e1ecd0e192790ab4fdb98c7b982176 +ENV PROJ_GIT_HASH e9c0e8c80595315921f2ae715a8ca6eca4a19558 RUN set -ex \ && cd /usr/src \ && git clone https://github.com/OSGeo/PROJ.git \ @@ -152,7 +152,7 @@ RUN set -ex \ && rm -fr /usr/src/PROJ # geos -ENV GEOS_GIT_HASH 1033161eca3684e0d9479daeafd35a4e0fb1800e +ENV GEOS_GIT_HASH c1927788e6e23c37c9f3d87dbdba5f92644a2a96 RUN set -ex \ && cd /usr/src \ && git clone https://github.com/libgeos/geos.git \ @@ -168,7 +168,7 @@ RUN set -ex \ && rm -fr /usr/src/geos # gdal -ENV GDAL_GIT_HASH 43e51bc48e7d48795ae60731ddc1414611ec5d3e +ENV GDAL_GIT_HASH 9a3e48a2cbc7f9fefd5fa2d61c1f5db2346a8fde RUN set -ex \ && cd /usr/src \ && git clone https://github.com/OSGeo/gdal.git \ @@ -301,11 +301,11 @@ COPY --from=builder /usr/local /usr/local ARG CGAL_GIT_BRANCH ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH} -ENV CGAL5X_GIT_HASH 3c8e2053721271119499506ea1d8a49dee89e30c -ENV SFCGAL_GIT_HASH fc4dc5640e402c8b00426b5a3562324226725df9 -ENV PROJ_GIT_HASH d4ebd920c1e1ecd0e192790ab4fdb98c7b982176 -ENV GEOS_GIT_HASH 1033161eca3684e0d9479daeafd35a4e0fb1800e -ENV GDAL_GIT_HASH 43e51bc48e7d48795ae60731ddc1414611ec5d3e +ENV CGAL5X_GIT_HASH 08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9 +ENV SFCGAL_GIT_HASH cbcf0adaa6cecc80347345952b5c850a64d2db4f +ENV PROJ_GIT_HASH e9c0e8c80595315921f2ae715a8ca6eca4a19558 +ENV GEOS_GIT_HASH c1927788e6e23c37c9f3d87dbdba5f92644a2a96 +ENV GDAL_GIT_HASH 9a3e48a2cbc7f9fefd5fa2d61c1f5db2346a8fde # Minimal command line test ( fail fast ) RUN set -ex \ @@ -324,7 +324,7 @@ RUN set -ex \ || echo "ogr2ogr missing PostgreSQL driver" && exit 1 # install postgis -ENV POSTGIS_GIT_HASH d7b58458ea7cf8157d09f59e955820d3a4321892 +ENV POSTGIS_GIT_HASH 42f04a29effdd9e8280c7aba17420ba306fc73f4 RUN set -ex \ && apt-get update \ diff --git a/16-master/Dockerfile b/16-master/Dockerfile index 2c2efae4..e862ff11 100644 --- a/16-master/Dockerfile +++ b/16-master/Dockerfile @@ -88,8 +88,8 @@ ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} # one can benefit from the latest CGAL patches while avoiding compatibility issues. ARG CGAL_GIT_BRANCH ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH} -ENV CGAL5X_GIT_HASH 3c8e2053721271119499506ea1d8a49dee89e30c -ENV SFCGAL_GIT_HASH fc4dc5640e402c8b00426b5a3562324226725df9 +ENV CGAL5X_GIT_HASH 08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9 +ENV SFCGAL_GIT_HASH cbcf0adaa6cecc80347345952b5c850a64d2db4f RUN set -ex \ && mkdir -p /usr/src \ && cd /usr/src \ @@ -98,7 +98,7 @@ RUN set -ex \ && git checkout ${CGAL5X_GIT_HASH} \ && git log -1 > /_pgis_cgal_last_commit.txt \ && cd /usr/src \ - && git clone https://gitlab.com/Oslandia/SFCGAL.git \ + && git clone https://gitlab.com/SFCGAL/SFCGAL.git \ && cd SFCGAL \ && git checkout ${SFCGAL_GIT_HASH} \ && git log -1 > /_pgis_sfcgal_last_commit.txt \ @@ -122,7 +122,7 @@ RUN set -ex \ && rm -fr /usr/src/cgal # proj -ENV PROJ_GIT_HASH d4ebd920c1e1ecd0e192790ab4fdb98c7b982176 +ENV PROJ_GIT_HASH e9c0e8c80595315921f2ae715a8ca6eca4a19558 RUN set -ex \ && cd /usr/src \ && git clone https://github.com/OSGeo/PROJ.git \ @@ -152,7 +152,7 @@ RUN set -ex \ && rm -fr /usr/src/PROJ # geos -ENV GEOS_GIT_HASH 1033161eca3684e0d9479daeafd35a4e0fb1800e +ENV GEOS_GIT_HASH c1927788e6e23c37c9f3d87dbdba5f92644a2a96 RUN set -ex \ && cd /usr/src \ && git clone https://github.com/libgeos/geos.git \ @@ -168,7 +168,7 @@ RUN set -ex \ && rm -fr /usr/src/geos # gdal -ENV GDAL_GIT_HASH 43e51bc48e7d48795ae60731ddc1414611ec5d3e +ENV GDAL_GIT_HASH 9a3e48a2cbc7f9fefd5fa2d61c1f5db2346a8fde RUN set -ex \ && cd /usr/src \ && git clone https://github.com/OSGeo/gdal.git \ @@ -301,11 +301,11 @@ COPY --from=builder /usr/local /usr/local ARG CGAL_GIT_BRANCH ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH} -ENV CGAL5X_GIT_HASH 3c8e2053721271119499506ea1d8a49dee89e30c -ENV SFCGAL_GIT_HASH fc4dc5640e402c8b00426b5a3562324226725df9 -ENV PROJ_GIT_HASH d4ebd920c1e1ecd0e192790ab4fdb98c7b982176 -ENV GEOS_GIT_HASH 1033161eca3684e0d9479daeafd35a4e0fb1800e -ENV GDAL_GIT_HASH 43e51bc48e7d48795ae60731ddc1414611ec5d3e +ENV CGAL5X_GIT_HASH 08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9 +ENV SFCGAL_GIT_HASH cbcf0adaa6cecc80347345952b5c850a64d2db4f +ENV PROJ_GIT_HASH e9c0e8c80595315921f2ae715a8ca6eca4a19558 +ENV GEOS_GIT_HASH c1927788e6e23c37c9f3d87dbdba5f92644a2a96 +ENV GDAL_GIT_HASH 9a3e48a2cbc7f9fefd5fa2d61c1f5db2346a8fde # Minimal command line test ( fail fast ) RUN set -ex \ @@ -324,7 +324,7 @@ RUN set -ex \ || echo "ogr2ogr missing PostgreSQL driver" && exit 1 # install postgis -ENV POSTGIS_GIT_HASH d7b58458ea7cf8157d09f59e955820d3a4321892 +ENV POSTGIS_GIT_HASH 42f04a29effdd9e8280c7aba17420ba306fc73f4 RUN set -ex \ && apt-get update \ diff --git a/Dockerfile.master.template b/Dockerfile.master.template index 0b78eb15..886c70d4 100644 --- a/Dockerfile.master.template +++ b/Dockerfile.master.template @@ -98,7 +98,7 @@ RUN set -ex \ && git checkout ${CGAL5X_GIT_HASH} \ && git log -1 > /_pgis_cgal_last_commit.txt \ && cd /usr/src \ - && git clone https://gitlab.com/Oslandia/SFCGAL.git \ + && git clone https://gitlab.com/SFCGAL/SFCGAL.git \ && cd SFCGAL \ && git checkout ${SFCGAL_GIT_HASH} \ && git log -1 > /_pgis_sfcgal_last_commit.txt \ diff --git a/update.sh b/update.sh index d7f8f48e..62733e88 100755 --- a/update.sh +++ b/update.sh @@ -49,7 +49,7 @@ declare -A postgisDebPkgNameVersionSuffixes=( packagesBase='http://apt.postgresql.org/pub/repos/apt/dists/' cgal5XGitHash="$(git ls-remote https://github.com/CGAL/cgal.git heads/5.6.x-branch | awk '{ print $1}')" -sfcgalGitHash="$(git ls-remote https://gitlab.com/Oslandia/SFCGAL.git heads/master | awk '{ print $1}')" +sfcgalGitHash="$(git ls-remote https://gitlab.com/SFCGAL/SFCGAL.git heads/master | awk '{ print $1}')" projGitHash="$(git ls-remote https://github.com/OSGeo/PROJ.git heads/master | awk '{ print $1}')" gdalGitHash="$(git ls-remote https://github.com/OSGeo/gdal.git refs/heads/master | grep '\srefs/heads/master' | awk '{ print $1}')" geosGitHash="$(git ls-remote https://github.com/libgeos/geos.git heads/main | awk '{ print $1}')"