Run CI on Ubuntu 22.04

brick · Jan 22, 2024 · 05f81c2 · 05f81c2
1 parent 9cccdc5
commit 05f81c2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -30,7 +30,7 @@ jobs:
 
   phpunit-mysql:
     name: PHPUnit MySQL
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     strategy:
       matrix:
@@ -90,7 +90,7 @@ jobs:
 
   phpunit-mariadb:
     name: PHPUnit MariaDB
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     strategy:
       matrix:
@@ -139,7 +139,7 @@ jobs:
 
   phpunit-postgres:
     name: PHPUnit PostgreSQL
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     strategy:
       matrix:
@@ -181,7 +181,7 @@ jobs:
 
   phpunit-sqlite:
     name: PHPUnit SQLite
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     strategy:
       matrix:
@@ -220,7 +220,7 @@ jobs:
 
   phpunit-geos:
     name: PHPUnit GEOS
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     strategy:
       matrix:

diff --git a/tests/GeometryEngineTest.php b/tests/GeometryEngineTest.php
@@ -219,9 +219,7 @@ public function testAzimuth(string $observerWkt, string $subjectWkt, ?float $azi
     {
         $geometryEngine = $this->getGeometryEngine();
 
-        if (! $this->isPostGIS()) {
-            $this->expectException(GeometryEngineException::class);
-        }
+        $this->requireEngine(['SpatiaLite', 'PostGIS']);
 
         $observer = Point::fromText($observerWkt);
         $subject = Point::fromText($subjectWkt);