Christoph Berg pushed to branch master at Debian GIS Project / postgis
Commits:
04351ff3 by Christoph Berg at 2022-08-29T16:40:27+02:00
Update ### build log markers so the apt.postgresql.org Jenkins understands them
- - - - -
2 changed files:
- debian/rules
- debian/tests/test-extension-creation
Changes:
=====================================
debian/rules
=====================================
@@ -97,7 +97,7 @@ override_dh_auto_configure:
done)
# PostGIS for the most recent PostgreSQL version
- @echo " ### configuring $(NEWEST_POSTGRES_VERSION) ###"
+ @echo "### PostgreSQL $(NEWEST_POSTGRES_VERSION) configure ###"
./configure $(COMMON_CONFIGURE_ARGS) \
--datadir=\$${prefix}/share/postgresql-$(NEWEST_POSTGRES_VERSION)-postgis \
--with-pgconfig=/usr/lib/postgresql/$(NEWEST_POSTGRES_VERSION)/bin/pg_config
@@ -105,7 +105,7 @@ override_dh_auto_configure:
# PostGIS for all older Postgres versions
(set -e; \
for PGVER in $(OTHER_POSTGRES_VERSIONS); do \
- echo " ### configuring $$PGVER ###"; \
+ echo "### PostgreSQL $$PGVER configure ###"; \
cd $(CURDIR)/debian/build-$$PGVER; \
./configure $(COMMON_CONFIGURE_ARGS) \
--datadir=\$${prefix}/share/postgresql-$$PGVER-postgis \
@@ -124,14 +124,14 @@ override_dh_auto_build:
done)
# Build against the newest Postgres version
- @echo " ### building $(NEWEST_POSTGRES_VERSION) ###"
+ @echo "### PostgreSQL $(NEWEST_POSTGRES_VERSION) build ###"
$(MAKE) $(NJOBS)
$(MAKE) $(NJOBS) -C doc
# Build against all other Postgres versions
(set -e; \
for PGVER in $(OTHER_POSTGRES_VERSIONS); do \
- echo " ### building $$PGVER ###"; \
+ echo "### PostgreSQL $$PGVER build ###"; \
$(MAKE) $(NJOBS) -C $(CURDIR)/debian/build-$$PGVER; \
done)
@@ -150,8 +150,8 @@ override_dh_auto_build:
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-# Run unit tests (against the newest Postgres version, first)
- echo " ### testing $(NEWEST_POSTGRES_VERSION) ###"
+# Run unit tests (against the newest Postgres version first)
+ @echo "### PostgreSQL $(NEWEST_POSTGRES_VERSION) test ###"
# Ignore test failure on problematic architectures
ifneq (,$(filter $(DEB_BUILD_ARCH),mips mips64el mipsel s390x alpha hppa
hurd-i386 kfreebsd-i386 powerpc ppc64 sparc64))
pg_virtualenv -v $(NEWEST_POSTGRES_VERSION) \
@@ -165,14 +165,14 @@ endif
ifneq (,$(filter $(DEB_BUILD_ARCH),mips mips64el mipsel s390x alpha hppa
hurd-i386 kfreebsd-i386 powerpc ppc64 sparc64))
set -e; \
for PGVER in $(OTHER_POSTGRES_VERSIONS); do \
- echo " ### testing $$PGVER ###"; \
+ echo "### PostgreSQL $$PGVER test ###"; \
pg_virtualenv -v $$PGVER \
make -C $(CURDIR)/debian/build-$$PGVER check
RUNTESTFLAGS="-v" || echo "Ignoring test failures"; \
done
else
set -e; \
for PGVER in $(OTHER_POSTGRES_VERSIONS); do \
- echo " ### testing $$PGVER ###"; \
+ echo "### PostgreSQL $$PGVER test ###"; \
pg_virtualenv -v $$PGVER \
make -C $(CURDIR)/debian/build-$$PGVER check
RUNTESTFLAGS="-v"; \
done
@@ -184,11 +184,13 @@ override_dh_auto_install:
# install only utils and extensions. However, there are sql scripts
# in postgis, raster and topology as well, which need to be
# installed for the -scripts package(s).
+ @echo "### PostgreSQL $(NEWEST_POSTGRES_VERSION) install ###"
$(MAKE) $(NJOBS) install DESTDIR=$(CURDIR)/debian/tmp
# Install all older Postgres versions.
(set -e; \
for PGVER in $(OTHER_POSTGRES_VERSIONS); do \
+ echo "### PostgreSQL $$PGVER install ###"; \
$(MAKE) $(NJOBS) -C $(CURDIR)/debian/build-$$PGVER \
install DESTDIR=$(CURDIR)/debian/tmp; \
done)
=====================================
debian/tests/test-extension-creation
=====================================
@@ -14,6 +14,7 @@ if [ "${ARCH}" = "armel" ] || [ "${ARCH}" = "armhf" ] || [
"${ARCH}" = "mips" ]
fi
for v in $(pg_buildext installed-versions); do
+ echo "### PostgreSQL $v autopkgtest ###"
pg_virtualenv -v $v sh -ex <<-'EOF'
# test extension (fuzzystrmatch is part of postgresql-contrib and is
needed by postgis_tiger_geocoder)
for ext in postgis postgis_raster postgis_sfcgal fuzzystrmatch
postgis_tiger_geocoder postgis_topology address_standardizer
address_standardizer_data_us; do
View it on GitLab:
https://salsa.debian.org/debian-gis-team/postgis/-/commit/04351ff358bb382ed4289625f63956c834414b98
--
View it on GitLab:
https://salsa.debian.org/debian-gis-team/postgis/-/commit/04351ff358bb382ed4289625f63956c834414b98
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
Pkg-grass-devel mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
