From 05f81c2681d619fc9cd64d3dc42c208880159e4b Mon Sep 17 00:00:00 2001 From: Benjamin Morel Date: Mon, 22 Jan 2024 23:44:25 +0100 Subject: [PATCH] Run CI on Ubuntu 22.04 --- .github/workflows/ci.yml | 10 +++++----- tests/GeometryEngineTest.php | 4 +--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f8dfc9f..4ccaacf 100644 --- 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 index 75165ad..863dc10 100644 --- 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);