Skip to content

Commit 32f99f5

Browse files
committed
revert 3.5.0beta1 workaround
1 parent 80703b0 commit 32f99f5

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

Dockerfile.alpine.template

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,7 @@ RUN set -eux \
6767
&& ./autogen.sh \
6868
&& ./configure \
6969
--enable-lto \
70-
{{ if .[env.variant].POSTGIS_CHECKOUT == "tags/3.5.0beta1" then ( -}}
71-
# postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779
72-
&& make -j1 \
73-
{{ ) else ( -}}
7470
&& make -j$(nproc) \
75-
{{ ) end -}}
7671
&& make install \
7772
\
7873
# This section is for refreshing the proj data for the regression tests.

Dockerfile.master.template

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -657,12 +657,7 @@ RUN set -eux \
657657
# https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie
658658
&& ./configure \
659659
--enable-lto \
660-
{{ if .[env.variant].POSTGIS_CHECKOUT == "tags/3.5.0beta1" then ( -}}
661-
# postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779
662-
&& make -j1 \
663-
{{ ) else ( -}}
664660
&& make -j$(nproc) \
665-
{{ ) end -}}
666661
&& make install \
667662
# refresh proj data - workarounds: https://trac.osgeo.org/postgis/ticket/5316
668663
&& if command -v projsync >/dev/null 2>&1; then \
@@ -753,6 +748,6 @@ RUN set -eux \
753748
&& dpkg-query -W -f='${Status}' ca-certificates 2>/dev/null | grep -c "ok installed" \
754749
\
755750
# list last commits.
756-
&& find /_pgis_*_last_commit.txt -type f -print -exec cat {} \; \
751+
&& find /_pgis*_commit.txt -type f -print -exec cat {} \; \
757752
# list postgresql, postgis version
758753
&& cat _pgis_full_version.txt

0 commit comments

Comments
 (0)