CI: Test Against Geos Versions

.github/workflows/CI.yml

@@ -27,30 +27,62 @@ jobs:
         os:
           - ubuntu
           # Windows users, feel free to open a PR :)
+          # See issue #242, windows support would be welcome.
           # - windows
           - macos
-        exclude:
-          - os: windows # See issue #242, windows support would be welcome.
+        geos:
+          - '3.12.0'
+          - '3.11.2'
+          - '3.10.5'
+          - '3.9.4'
+          - '3.8.3'
     runs-on: ${{ matrix.os }}-latest
     continue-on-error: ${{ matrix.ruby == 'head' || matrix.os == 'windows' || matrix.os == 'macos' }}
-    name: Ruby ${{ matrix.ruby }} (${{ matrix.os }})
+    name: Ruby ${{ matrix.ruby }}, Geos ${{ matrix.geos }} (${{ matrix.os }})
     steps:
       - uses: actions/checkout@v3
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-      - name: Install Geos (Linux)
+      - name: Install Packages (Linux)
         if: matrix.os == 'ubuntu'
         run: |
           sudo apt-add-repository ppa:ubuntugis/ubuntugis-unstable
-          sudo apt-get install -yqq libgeos-dev
-      - name: Install Geos (Mac)
+          sudo apt-get install curl libcurl4-openssl-dev libssl-dev cmake
+      - name: Install Packages (Mac)
         if: matrix.os == 'macos'
-        run: HOMEBREW_NO_INSTALL_CLEANUP=1 brew install geos
-      - name: Install Geos (Windows)
-        if: matrix.os == 'windows'
-        run: TODO
+        run: |
+          brew update
+          HOMEBREW_NO_INSTALL_CLEANUP=1 brew install --force cmake
+          brew upgrade cmake
+      - uses: actions/cache@v2
+        id: geos-cache
+        with:
+          path: ./geos-${{ matrix.geos }}
+          key: geos-${{ matrix.geos }}-${{ matrix.os }}
+      - name: Download and Compile Geos
+        if: steps.geos-cache.outputs.cache-hit != 'true'
+        run: |
+          wget -c https://download.osgeo.org/geos/geos-${{ matrix.geos }}.tar.bz2
+          tar -xf geos-${{ matrix.geos }}.tar.bz2
+          cd geos-${{ matrix.geos }}
+          mkdir build
+          cd build
+          cmake ..
+          cmake --build . -j2
+          cd ../../
+      - name: Install Geos
+        run: |
+          cd geos-${{ matrix.geos }}/build
+          sudo cmake --build . --target install
+          cd ../../
+      - name: ldconfig
+        if: matrix.os == 'ubuntu'
+        run: sudo ldconfig
+      - name: Set GEOS_LIBRARY_PATH (macos jruby)
+        if: matrix.os == 'macos' && matrix.ruby == 'jruby'
+        run: export GEOS_LIBRARY_PATH=/usr/local/lib/libgeos_c.dylib
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
       - name: Bundle Install
         run: bundle install
       - name: Set Maintainer Mode

test/common/validity_tests.rb

@@ -224,6 +224,7 @@ def test_invalid_polygon_inconsistent_area
 
         def test_invalid_polygon_duplicate_rings
           poly = @factory.polygon(big_square, [little_square, little_square])
+
           assert_equal(RGeo::Error::SELF_INTERSECTION, poly.invalid_reason)
           assert_equal(false, poly.valid?)
         end

test/geos_capi/validity_test.rb

@@ -31,4 +31,15 @@ def test_invalid_polygon_self_intersecting_ring_invalid_reason_location
     assert_equal(RGeo::Error::SELF_INTERSECTION, poly.invalid_reason)
     assert_equal(false, poly.valid?)
   end
+
+  def test_invalid_polygon_duplicate_rings
+    poly = @factory.polygon(big_square, [little_square, little_square])
+
+    if geos_version_match(">= 3.10.0")
+      assert_equal(RGeo::Error::SELF_INTERSECTION, poly.invalid_reason)
+    else
+      assert_equal(RGeo::Error::DUPLICATE_RINGS, poly.invalid_reason)
+    end
+    assert_equal(false, poly.valid?)
+  end
 end

test/geos_ffi/misc_test.rb

@@ -102,4 +102,4 @@ def test_casting_dumb_objects
   end
 end
 
-puts "WARNING: FFI-GEOS support not available. Related tests skipped." unless RGeo::Geos.ffi_supported?
+puts "WARNING: FFI-GEOS support not available. Related tests skipped. Reason: #{RGeo::Geos::FFI_SUPPORT_EXCEPTION}" unless RGeo::Geos.ffi_supported?

test/geos_ffi/validity_test.rb

@@ -16,4 +16,15 @@ class GeosFFIValidityTest < Minitest::Test # :nodoc:
   def setup
     @factory = RGeo::Geos.factory(native_interface: :ffi)
   end
+
+  def test_invalid_polygon_duplicate_rings
+    poly = @factory.polygon(big_square, [little_square, little_square])
+
+    if geos_version_match(">= 3.10.0")
+      assert_equal(RGeo::Error::SELF_INTERSECTION, poly.invalid_reason)
+    else
+      assert_equal(RGeo::Error::DUPLICATE_RINGS, poly.invalid_reason)
+    end
+    assert_equal(false, poly.valid?)
+  end
 end

test/simple_mercator/validity_test.rb

@@ -16,6 +16,17 @@ def setup
     @factory = RGeo::Geographic.simple_mercator_factory
   end
 
+  def test_invalid_polygon_duplicate_rings
+    poly = @factory.polygon(big_square, [little_square, little_square])
+
+    if geos_version_match(">= 3.10.0")
+      assert_equal(RGeo::Error::SELF_INTERSECTION, poly.invalid_reason)
+    else
+      assert_equal(RGeo::Error::DUPLICATE_RINGS, poly.invalid_reason)
+    end
+    assert_equal(false, poly.valid?)
+  end
+
   # Taken from RGeo::Tests::Common::ValidityTests, but adapted to have a
   # correct area.
   def square_polygon_expected_area