[geos-commits] [SCM] GEOS branch 3.10 updated. 9527bc226211379cc53f57823a87472764965bd9
git at osgeo.org
git at osgeo.org
Sat Nov 11 18:54:11 PST 2023
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 "GEOS".
The branch, 3.10 has been updated
via 9527bc226211379cc53f57823a87472764965bd9 (commit)
via 7cb33c988bb0115f4fe107785570ae5786ed2401 (commit)
from 9b5e544da70a58becd7bca4251e6b43942124da2 (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 9527bc226211379cc53f57823a87472764965bd9
Author: Regina Obe <lr at pcorp.us>
Date: Sat Nov 11 21:53:53 2023 -0500
Push to 3.10.7dev release cycle
diff --git a/NEWS b/NEWS
index 22fe0f2ab..3042a8703 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+## Changes in 3.10.7
+20xx-xx-xx
+
+- Fixes/Improvements:
+
+
## Changes in 3.10.6
2023-11-11
diff --git a/Version.txt b/Version.txt
index 4fb995175..1d4018441 100644
--- a/Version.txt
+++ b/Version.txt
@@ -2,10 +2,10 @@
# GEOS Versions
GEOS_VERSION_MAJOR=3
GEOS_VERSION_MINOR=10
-GEOS_VERSION_PATCH=6
+GEOS_VERSION_PATCH=7
# OPTIONS: "", "dev", "rc1" etc.
-GEOS_PATCH_WORD=
+GEOS_PATCH_WORD=dev
# GEOS CAPI Versions
#
@@ -16,7 +16,7 @@ GEOS_PATCH_WORD=
# ( THIS MUST BE CAREFULLY AVOIDED )
#
CAPI_INTERFACE_CURRENT=17
-CAPI_INTERFACE_REVISION=6
+CAPI_INTERFACE_REVISION=7
CAPI_INTERFACE_AGE=16
# JTS Port
commit 7cb33c988bb0115f4fe107785570ae5786ed2401
Author: Regina Obe <lr at pcorp.us>
Date: Sat Nov 11 21:28:13 2023 -0500
Update to use GHA CI for releasing
Prep for 3.10.6 release
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 000000000..21c6571d8
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,77 @@
+#
+# GitHub Actions for GEOS Web Pages
+# Paul Ramsey <pramsey at cleverelephant.ca>, Regina Obe <lr at pcorp.us>
+#
+
+#
+# Only run on tag
+# Only release if distcheck succeeds
+# Only release of the tag name is identical to the full version
+# Use the first block of NEWS entries as release notes
+#
+
+name: 'Release'
+
+on:
+ push:
+ tags:
+ - '*.*.*'
+
+jobs:
+ release:
+ name: 'Release on Tag'
+ runs-on: ubuntu-latest
+
+ # Only run docbuild on central repo
+ if: github.repository == 'libgeos/geos'
+ steps:
+
+ - name: 'Install'
+ run: |
+ pwd
+ uname -a
+ sudo -E apt-get -yq --no-install-suggests --no-install-recommends install make doxygen
+
+ - name: 'Check Out'
+ uses: actions/checkout at v3
+
+ - name: Get tag
+ id: tag
+ uses: dawidd6/action-get-tag at v1
+
+ - name: 'Read Version'
+ id: version
+ run: |
+ pwd
+ source Version.txt
+ GEOS_FULL_VERSION=${GEOS_VERSION_MAJOR}.${GEOS_VERSION_MINOR}.${GEOS_VERSION_PATCH}${GEOS_PATCH_WORD}
+ echo GEOS_FULL_VERSION $GEOS_FULL_VERSION
+ echo "::set-output name=geosversion::${GEOS_FULL_VERSION}"
+
+ - name: 'Create Release Notes'
+ id: notes
+ run: |
+ pwd
+ perl tools/ci/releasenotes.pl NEWS > release.md
+ echo "::set-output name=geosnotes::./release.md"
+
+ - name: 'Bundle & Check Package'
+ id: bundle
+ run: |
+ pwd
+ set -e
+ mkdir _build && cd _build
+ cmake -DBUILD_DOCUMENTATION=YES ..
+ cmake --version
+ cmake --build . --target distcheck
+
+ - name: Create Release
+ if: ${{ steps.tag.outputs.tag == steps.version.outputs.geosversion }}
+ id: create_release
+ uses: softprops/action-gh-release at v1
+ with:
+ body_path: ${{ steps.notes.outputs.geosnotes }}
+ name: Release ${{ steps.version.outputs.geosversion }}
+ prerelease: false
+ files: |
+ ./_build/geos*.tar.bz2
\ No newline at end of file
diff --git a/HOWTO_RELEASE b/HOWTO_RELEASE
index 9c7e83a07..e413bceab 100644
--- a/HOWTO_RELEASE
+++ b/HOWTO_RELEASE
@@ -4,6 +4,7 @@
- GEOS_VERSION_PATCH
- GEOS_VERSION_MINOR
- GEOS_VERSION_MAJOR
+ - GEOS_PATCH_WORD
- CAPI_INTERFACE_CURRENT
- CAPI_INTERFACE_REVISION
@@ -20,46 +21,40 @@
$ ctest --output-on-failure .
$ cmake --build . --target distcheck
-4. Update the NEWS file (extract most important things from the
- repository log). Make sure to update the release date.
+4. Update the NEWS file (extract most important things from the repository log).
+ Make sure to update the release date.
5. Commit the changes in the NEWS file.
+ Push changes with: git push origin,
+ and confirm all bots are green before moving forward
-6. Build the distribution package.
-
- $ BRANCH_NAME=3.10
- $ git clone --depth 1 --branch $BRANCH_NAME \
- https://github.com/libgeos/geos.git geos-$BRANCH_NAME
- $ cd geos-$BRANCH_NAME
- $ mkdir _build && cd _build
- $ cmake ..
- $ cmake --build . --target dist
-
-7. Verify that you can un-pack and build the tarball.
-
- $ tar xvfz geos-VERSION.tar.bz2
- $ cd geos-VERSION
- $ mkdir _build && cd _build && cmake ..
- $ cmake --build .
- $ ctest --output-on-failure .
-
-8. Copy the tarball to upload.osgeo.org:/osgeo/download/geos
-
-9. Tag the release:
+6. Tag the release:
$ git tag MAJOR.MINOR.PATCH
$ git push origin MAJOR.MINOR.PATCH
-10. Create and push a release branch if this was a PATCH=0 release,
- update the versions for next release in Version.txt (both in
- main and release branch if this was a PATCH=0 release).
+7. At this point the github/release.yml action should run,
+ wait for it to finish and then verify you can build with it.
-11. Update web page Download section
+ $ VERSION=MAJOR.MINOR.PATCH
+ $ wget https://github.com/libgeos/geos/releases/download/$VERSION/geos-$VERSION.tar.bz2
+ $ tar xvfz geos-$VERSION.tar.bz2
+ $ cd geos-$VERSION
+ $ mkdir _build && cd _build && cmake ..
+ $ cmake --build .
+ $ ctest --output-on-failure .
+
+8. Copy the tar.bz2 tarball to upload.osgeo.org:/osgeo/download/geos
+
+9. Create and push a release branch if this was a PATCH=0 release,
+ update the versions for next release in Version.txt (both in
+ main and release branch).
+
+10. Update download page in main branch: web/content/usage/download.md
- Add latest release
- Remove previous patch level release (if any)
-12. Close current github milestone and add new one for next release
-
-12. Announce on geos-devel
+11. Close current GitHub milestone and add a new one for next release.
+12. Announce on geos-devel
\ No newline at end of file
diff --git a/NEWS b/NEWS
index 82b9dd0fe..22fe0f2ab 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
-Changes in 3.10.6
-2023-xx-xx
+## Changes in 3.10.6
+2023-11-11
- Fixes/Improvements:
- LargestEmptyCircle: enhance boundary to allow any polygonal geometry (GH-859, Martin Davis)
@@ -9,8 +9,9 @@ Changes in 3.10.6
- Remove undefined behaviour in use of null PrecisionModel (GH-931, Jeff Walton)
- PreparedLineStringIntersects: Fix incorrect result with mixed-dim collection with points (GH-774, Dan Baston)
- Skip over testing empty distances for mixed collections (GH-979, Paul Ramsey)
+ - Do not hide illegal argument exception in HeuristicOverlay (GH-925, Sandro Santilli)
-Changes in 3.10.5
+## Changes in 3.10.5
2023-03-16
- Fixes/Improvements:
diff --git a/Version.txt b/Version.txt
index 8c70ce72e..4fb995175 100644
--- a/Version.txt
+++ b/Version.txt
@@ -5,7 +5,7 @@ GEOS_VERSION_MINOR=10
GEOS_VERSION_PATCH=6
# OPTIONS: "", "dev", "rc1" etc.
-GEOS_PATCH_WORD=dev
+GEOS_PATCH_WORD=
# GEOS CAPI Versions
#
@@ -16,7 +16,7 @@ GEOS_PATCH_WORD=dev
# ( THIS MUST BE CAREFULLY AVOIDED )
#
CAPI_INTERFACE_CURRENT=17
-CAPI_INTERFACE_REVISION=3
+CAPI_INTERFACE_REVISION=6
CAPI_INTERFACE_AGE=16
# JTS Port
diff --git a/tools/ci/releasenotes.pl b/tools/ci/releasenotes.pl
new file mode 100644
index 000000000..4c22f3847
--- /dev/null
+++ b/tools/ci/releasenotes.pl
@@ -0,0 +1,11 @@
+my $first = 0;
+while(<>) {
+ if (/^##/ && !$first) {
+ $first = 1;
+ next;
+ }
+ if (/^##/ && $first) {
+ exit;
+ }
+ print;
+}
-----------------------------------------------------------------------
Summary of changes:
.github/workflows/release.yml | 77 +++++++++++++++++++++++++++++++++++++++++++
HOWTO_RELEASE | 45 +++++++++++--------------
NEWS | 13 ++++++--
Version.txt | 4 +--
tools/ci/releasenotes.pl | 11 +++++++
5 files changed, 120 insertions(+), 30 deletions(-)
create mode 100644 .github/workflows/release.yml
create mode 100644 tools/ci/releasenotes.pl
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list