Merge pull request #108 from twpayne/update-deps

Update dependencies

.github/workflows/main.yml

@@ -19,7 +19,7 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt-get install -y libgeos-dev
-    - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
+    - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491
       with:
         go-version: ${{ matrix.go-version }}
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
@@ -36,14 +36,14 @@ jobs:
     - name: Build
       run: go build ./...
     - name: Test
-      run: go test -race ./...
+      run: go test ./... # FIXME enable race detector
   lint:
     runs-on: ubuntu-22.04
     steps:
     - name: Install dependencies
       run: |
         sudo apt-get install -y libgeos-dev
-    - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
+    - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491
       with:
         go-version: stable
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
@@ -63,24 +63,27 @@ jobs:
     - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84
       id: cache-geos
       with:
-        path: ~/work/go-geos/go-geos/geos-${{ matrix.geos-version }}
-        key: ${{ runner.os }}-geos-${{ matrix.geos-version }}-build
+        path: ~/work/geos-${{ matrix.geos-version }}
+        key: ${{ runner.os }}-geos-${{ matrix.geos-version }}
     - name: build-geos
       if: ${{ steps.cache-geos.outputs.cache-hit != 'true' }}
       run: |
-        echo $PWD
+        cd ~/work
         curl https://download.osgeo.org/geos/geos-${{ matrix.geos-version }}.tar.bz2 | tar xjf -
         cd geos-${{ matrix.geos-version }}
         mkdir _build
         cd _build
         cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local ..
-        make -j2
+        make -j4
         ctest
+    - name: list-geos-files
+      run: |
+        find ~/work/geos-${{ matrix.geos-version }}
     - name: install-geos
       run: |
-        cd geos-${{ matrix.geos-version }}/_build
+        cd ~/work/geos-${{ matrix.geos-version }}/_build
         sudo make install
-    - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
+    - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491
       with:
         go-version: stable
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11

defaultcontext.go

@@ -48,7 +48,7 @@ func NewEmptyPolygon() *Geom {
 	return DefaultContext.NewEmptyPolygon()
 }
 
-// NewGEOMFromGeoJSON parses a geometry in GeoJSON format from geoJSON.
+// NewGEOMFromGeoJSON parses a geometry in GeoJSON format from GeoJSON.
 func NewGeomFromGeoJSON(geoJSON string) (*Geom, error) {
 	return DefaultContext.NewGeomFromGeoJSON(geoJSON)
 }

geometry/geojson.go

@@ -24,7 +24,7 @@ var (
 	errUnsupportedEmptyGeometry = errors.New("unsupported empty geometry")
 )
 
-// NewGeometryFromGeoJSON returns a new Geometry parsed from geoJSON.
+// NewGeometryFromGeoJSON returns a new Geometry parsed from GeoJSON.
 func NewGeometryFromGeoJSON(geoJSON []byte) (*Geometry, error) {
 	g := &Geometry{}
 	if err := g.UnmarshalJSON(geoJSON); err != nil {

go.mod

@@ -3,41 +3,41 @@ module github.com/twpayne/go-geos
 go 1.18
 
 require (
-	github.com/alecthomas/assert/v2 v2.3.0
+	github.com/alecthomas/assert/v2 v2.4.1
 	github.com/lib/pq v1.10.9
 	github.com/ory/dockertest/v3 v3.10.0
-	golang.org/x/exp v0.0.0-20231006140011-7918f672742d
+	golang.org/x/exp v0.0.0-20231226003508-02704c960a9b
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
-	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
-	github.com/Microsoft/go-winio v0.6.0 // indirect
+	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
+	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
-	github.com/alecthomas/repr v0.2.0 // indirect
-	github.com/cenkalti/backoff/v4 v4.1.3 // indirect
-	github.com/containerd/continuity v0.3.0 // indirect
-	github.com/docker/cli v20.10.17+incompatible // indirect
+	github.com/alecthomas/repr v0.3.0 // indirect
+	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
+	github.com/containerd/continuity v0.4.3 // indirect
+	github.com/docker/cli v24.0.7+incompatible // indirect
 	github.com/docker/docker v24.0.7+incompatible // indirect
 	github.com/docker/go-connections v0.4.0 // indirect
-	github.com/docker/go-units v0.4.0 // indirect
+	github.com/docker/go-units v0.5.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
 	github.com/hexops/gotextdiff v1.0.3 // indirect
-	github.com/imdario/mergo v0.3.13 // indirect
+	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
-	github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
+	github.com/moby/term v0.5.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.0.2 // indirect
-	github.com/opencontainers/runc v1.1.5 // indirect
+	github.com/opencontainers/runc v1.1.10 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/sirupsen/logrus v1.8.1 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/stretchr/testify v1.8.2 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
-	golang.org/x/mod v0.13.0 // indirect
-	golang.org/x/sys v0.13.0 // indirect
-	golang.org/x/tools v0.14.0 // indirect
+	golang.org/x/mod v0.14.0 // indirect
+	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/tools v0.16.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )