[postgis-tickets] [SCM] PostGIS branch master updated. 3.2.0-399-ga7298c25a
git at osgeo.org
git at osgeo.org
Fri Jan 28 11:13:05 PST 2022
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".
The branch, master has been updated
via a7298c25a7531f78fb4a8c8861c407da942667cc (commit)
from 4fa57df0b3bd726346e1fd272921a29ab888b55f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a7298c25a7531f78fb4a8c8861c407da942667cc
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Fri Jan 28 11:12:30 2022 -0800
Replace references to 'travis' with references to 'github'
in the CI scripts and script locations.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f18f5ebba..657843170 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -50,7 +50,7 @@ jobs:
uname -a
echo "FROM postgis/postgis-build-env:${{ matrix.ci.tag }}" > Dockerfile
echo "ADD --chown=postgres:postgres . /src/postgis" >> Dockerfile
- echo "CMD bash ci/travis/run_${{ matrix.ci.mode }}.sh" >> Dockerfile
+ echo "CMD bash ci/github/run_${{ matrix.ci.mode }}.sh" >> Dockerfile
docker build -t pgtest .
- name: 'Build & Test'
diff --git a/README.md b/README.md
index 148fb3e0d..f68922026 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,12 @@
-| **Debbie** | **Winnie** | **Dronie** ||
+| **Debbie** | **Winnie** | **Dronie** |
+| --------- | ---------- | --------- |
| [](https://debbie.postgis.net/view/PostGIS/job/PostGIS_trunk/) | [](https://winnie.postgis.net/view/PostGIS/job/PostGIS_trunk/) | [](https://dronie.osgeo.org/postgis/postgis?branch=master) ||
-| **Bessie** | **Bessie32** | **Cirrus-ci** ||
-| [](https://debbie.postgis.net/view/PostGIS/job/PostGIS_Worker_Run/label=bessie/) | [](https://debbie.postgis.net/view/PostGIS/job/PostGIS_Worker_Run/label=bessie32/) | [](http://cirrus-ci.com/github/postgis/postgis) ||
-| **Berrie** | **Berrie64** | ||
+| **Bessie** | **Bessie32** | **Cirrus-CI** |
+| [](https://debbie.postgis.net/view/PostGIS/job/PostGIS_Worker_Run/label=bessie/) | [](https://debbie.postgis.net/view/PostGIS/job/PostGIS_Worker_Run/label=bessie32/) | [](http://cirrus-ci.com/github/postgis/postgis) |
+| **Berrie** | **Berrie64** |
| [](https://debbie.postgis.net/view/PostGIS/job/PostGIS_Worker_Run/label=berrie/) | [](https://debbie.postgis.net/view/PostGIS/job/PostGIS_Worker_Run/label=berrie64/) | ||
-| **GitHub** | **GitLab** ||
-| :---: | :---: | :---: ||
+| **GitHub** | **GitLab** |
| [](https://github.com/postgis/postgis/actions?query=branch%3Amaster) | [](https://gitlab.com/postgis/postgis/commits/master) ||
This file is here to play nicely with modern code repository facilities.
diff --git a/README.postgis b/README.postgis
index 0b84fb92d..e50a5f6fc 100644
--- a/README.postgis
+++ b/README.postgis
@@ -180,7 +180,7 @@ flags throughout. A way to get such an environment is to use the same docker ima
as the PostGIS CI setup and that can be done on a *nix host by first running this
in a cloned postgis repository to later get core dump log output:
-> sudo bash ./ci/travis/logbt --setup
+> sudo bash ./ci/github/logbt --setup
Then you can run the following to get a docker container up and running with the
correct requirements already in place and the postgis repository (at `/postgis`)
@@ -192,7 +192,7 @@ postgis/postgis-build-env:pg13-geos39-gdal31-proj71 /bin/bash
And finally the following command inside the container will build and run all the
postgis tests:
-> bash ./ci/travis/run_usan_gcc.sh
+> bash ./ci/github/run_usan_gcc.sh
You can make customized versions of `run_usan_gcc.sh` to run only specific tests
and skip redundant steps.
diff --git a/ci/travis/logbt b/ci/github/logbt
similarity index 100%
rename from ci/travis/logbt
rename to ci/github/logbt
diff --git a/ci/travis/run_coverage.sh b/ci/github/run_coverage.sh
similarity index 100%
rename from ci/travis/run_coverage.sh
rename to ci/github/run_coverage.sh
diff --git a/ci/travis/run_debug.sh b/ci/github/run_debug.sh
similarity index 100%
rename from ci/travis/run_debug.sh
rename to ci/github/run_debug.sh
diff --git a/ci/travis/run_garden.sh b/ci/github/run_garden.sh
similarity index 91%
rename from ci/travis/run_garden.sh
rename to ci/github/run_garden.sh
index e922b5897..678802013 100644
--- a/ci/travis/run_garden.sh
+++ b/ci/github/run_garden.sh
@@ -9,5 +9,5 @@ LDFLAGS_STD="--coverage"
./autogen.sh
./configure CFLAGS="${CFLAGS_STD}" LDFLAGS="${LDFLAGS_STD}" --enable-debug
make -j
-bash ./ci/travis/logbt -- make garden
+bash ./ci/github/logbt -- make garden
(curl -S -f https://codecov.io/bash -o .github/codecov.bash && bash .github/codecov.bash) || echo "Coverage report failed"
diff --git a/ci/travis/run_tests.sh b/ci/github/run_tests.sh
similarity index 87%
rename from ci/travis/run_tests.sh
rename to ci/github/run_tests.sh
index 36a34ecf0..581985343 100644
--- a/ci/travis/run_tests.sh
+++ b/ci/github/run_tests.sh
@@ -16,5 +16,5 @@ export CUNIT_VALGRIND_FLAGS="--leak-check=full --error-exitcode=1"
# Standard build
./configure CFLAGS="${CFLAGS_STD}" LDFLAGS="${LDFLAGS_STD}"
-bash ./ci/travis/logbt -- make -j
-bash ./ci/travis/logbt -- make check RUNTESTFLAGS=--verbose
+bash ./ci/github/logbt -- make -j
+bash ./ci/github/logbt -- make check RUNTESTFLAGS=--verbose
diff --git a/ci/travis/run_usan_clang.sh b/ci/github/run_usan_clang.sh
similarity index 90%
rename from ci/travis/run_usan_clang.sh
rename to ci/github/run_usan_clang.sh
index ac03e409c..70652ba0b 100644
--- a/ci/travis/run_usan_clang.sh
+++ b/ci/github/run_usan_clang.sh
@@ -17,5 +17,5 @@ LD_PRELOAD=/usr/lib/clang/11/lib/linux/libclang_rt.asan-x86_64.so \
# Build with Clang and usan flags
./autogen.sh
./configure CC=clang CFLAGS="${CFLAGS_USAN}" LDFLAGS="${LDFLAGS_STD}"
-bash ./ci/travis/logbt -- make -j
-bash ./ci/travis/logbt -- make check RUNTESTFLAGS=--verbose
+bash ./ci/github/logbt -- make -j
+bash ./ci/github/logbt -- make check RUNTESTFLAGS=--verbose
diff --git a/ci/travis/run_usan_gcc.sh b/ci/github/run_usan_gcc.sh
similarity index 81%
rename from ci/travis/run_usan_gcc.sh
rename to ci/github/run_usan_gcc.sh
index 3fb7135c2..3a66c2882 100644
--- a/ci/travis/run_usan_gcc.sh
+++ b/ci/github/run_usan_gcc.sh
@@ -10,5 +10,5 @@ LDFLAGS_STD="-Wl,-Bsymbolic-functions -Wl,-z,relro"
# Build with GCC and usan flags
./configure CC=gcc CFLAGS="${CFLAGS_STD}" LDFLAGS="${LDFLAGS_STD}"
-bash ./ci/travis/logbt -- make -j
-bash ./ci/travis/logbt -- make check RUNTESTFLAGS=--verbose
+bash ./ci/github/logbt -- make -j
+bash ./ci/github/logbt -- make check RUNTESTFLAGS=--verbose
diff --git a/doc/introduction.xml b/doc/introduction.xml
index 0889b1128..a83b1975a 100644
--- a/doc/introduction.xml
+++ b/doc/introduction.xml
@@ -53,7 +53,7 @@
<varlistentry>
<term>Darafei Praliaskouski</term>
<listitem>
- <para>Index improvements, bug fixing and geometry/geography function improvements, SFCGAL, raster, GitHub curation, and Travis bot maintenance.</para>
+ <para>Index improvements, bug fixing and geometry/geography function improvements, SFCGAL, raster, GitHub curation, and bot maintenance.</para>
</listitem>
</varlistentry>
diff --git a/regress/core/interrupt_buffer.sql b/regress/core/interrupt_buffer.sql
index e45db0c71..c0d6a4fb5 100644
--- a/regress/core/interrupt_buffer.sql
+++ b/regress/core/interrupt_buffer.sql
@@ -35,7 +35,6 @@ SET statement_timeout TO 100;
select ST_Buffer(g,100) from _inputs WHERE id = 1;
--( select (st_dumppoints(st_buffer(st_makepoint(0,0),10000,100000))).geom g) foo;
-- it may take some more to interrupt st_buffer, see
--- https://travis-ci.org/postgis/postgis/builds/40211116#L2222-L2223
SELECT _timecheck('buffer', '200ms');
-- Not affected by old timeout
-----------------------------------------------------------------------
Summary of changes:
.github/workflows/ci.yml | 2 +-
README.md | 12 ++++++------
README.postgis | 4 ++--
ci/{travis => github}/logbt | 0
ci/{travis => github}/run_coverage.sh | 0
ci/{travis => github}/run_debug.sh | 0
ci/{travis => github}/run_garden.sh | 2 +-
ci/{travis => github}/run_tests.sh | 4 ++--
ci/{travis => github}/run_usan_clang.sh | 4 ++--
ci/{travis => github}/run_usan_gcc.sh | 4 ++--
doc/introduction.xml | 2 +-
regress/core/interrupt_buffer.sql | 1 -
12 files changed, 17 insertions(+), 18 deletions(-)
rename ci/{travis => github}/logbt (100%)
rename ci/{travis => github}/run_coverage.sh (100%)
rename ci/{travis => github}/run_debug.sh (100%)
rename ci/{travis => github}/run_garden.sh (91%)
rename ci/{travis => github}/run_tests.sh (87%)
rename ci/{travis => github}/run_usan_clang.sh (90%)
rename ci/{travis => github}/run_usan_gcc.sh (81%)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list