Merge branch 'master' into remove_rtree_insert_and_delete_methods

.github/workflows/ci.yml

@@ -6,9 +6,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: CI
-      run: |
-        "$GITHUB_WORKSPACE/.ci/run_ci.sh"
+    - name: lint
+      run: make lint
+    - name: unit
+      run: make unit
+    - name: geos
+      run: make geos
+    - name: pgscan
+      run: make pgscan
+    - name: cmppg
+      run: make cmppg
+    - name: cmpgeos
+      run: make cmpgeos
     - name: Convert coverage to lcov
       uses: jandelgado/gcov2lcov-action@v1.0.2
       with:

CHANGELOG.md

@@ -2,15 +2,26 @@
 
 ## Unreleased
 
-- Adds a wrapper in the `geos` package for the `GEOSUnaryUnion_r` function
-  (exposed as `UnaryUnion`).
-
 - **Breaking change**: Removes the `Insert` and `Delete` methods from the
   `RTree` type in the `rtree` package. Users relying on the `Insert` and
   `Delete` methods are advised to restructure their programs not to rely on
   them, or use alternative r-tree implementations, such as the
   `github.com/tidwall/rtree` package.
 
+## v0.43.0
+
+2023-06-05
+
+__Special thanks to Albert Teoh for contributing to this release.__
+
+- Adds wrappers in the `geos` package for the `GEOSUnaryUnion_r` and
+  `GEOSCoverageUnion_r` functions (exposed as `UnaryUnion` and
+  `CoverageUnion`).
+
+- Runs CI against all non-EOL versions of GEOS (3.7 through to 3.11).
+
+- Replaces CI scripts with a Makefile.
+
 ## v0.42.1
 
 2023-05-05

Makefile

@@ -0,0 +1,61 @@
+DC_RUN = \
+	docker compose \
+	--project-name $$task \
+	--file .ci/docker-compose-$$task.yml \
+	up \
+	--abort-on-container-exit
+
+.PHONY: lint
+lint:
+	task=lint; $(DC_RUN)
+
+.PHONY: unit
+unit:
+	task=unit; $(DC_RUN)
+
+.PHONY: pgscan
+pgscan:
+	task=pgscan; $(DC_RUN)
+
+.PHONY: cmppg
+cmppg:
+	task=cmppg; $(DC_RUN)
+
+.PHONY: cmpgeos
+cmpgeos:
+	task=cmpgeos; $(DC_RUN)
+
+DC_GEOS_RUN = \
+	env GEOS_VERSION=$$version \
+	docker compose \
+	--project-name sf-geos-$$(echo $$version | sed 's/\./-/g') \
+	--file .ci/docker-compose-geos.yml \
+	up \
+	--abort-on-container-exit
+
+.PHONY: geos-3.11
+geos-3.11:
+	version=3.11.2; $(DC_GEOS_RUN)
+
+.PHONY: geos-3.10
+geos-3.10:
+	version=3.10.5; $(DC_GEOS_RUN)
+
+.PHONY: geos-3.9
+geos-3.9:
+	version=3.9.4; $(DC_GEOS_RUN)
+
+.PHONY: geos-3.8
+geos-3.8:
+	version=3.8.3; $(DC_GEOS_RUN)
+
+.PHONY: geos-3.7
+geos-3.7:
+	version=3.7.5; $(DC_GEOS_RUN)
+
+.PHONY: geos
+geos: geos-3.11
+geos: geos-3.10
+geos: geos-3.9
+geos: geos-3.8
+geos: geos-3.7