Stop testing PostGIS on Windows

roji · roji · commit 617ebccdeb77 · 2025-10-29T20:38:13.000+01:00
Because of installation reliability issues
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -59,6 +59,12 @@ jobs:
       is_release: ${{ steps.analyze_tag.outputs.is_release }}
       is_prerelease: ${{ steps.analyze_tag.outputs.is_prerelease }}
 
+    # Installing PostGIS on Windows is complicated/unreliable, so we don't test on it.
+    # The NPGSQL_TEST_POSTGIS environment variable ensures that if PostGIS isn't installed,
+    # the PostGIS tests fail and therefore fail the build.
+    env:
+      NPGSQL_TEST_POSTGIS: ${{ startsWith(matrix.os, 'windows') ? 'false' : 'true' }}
+
     steps:
       - name: Checkout
         uses: actions/checkout@v5
@@ -165,28 +171,6 @@ jobs:
           # Match Npgsql CI Docker image and stash one level up
           cp $GITHUB_WORKSPACE/.build/{server.crt,server.key,ca.crt} pgsql
 
-          # Find OSGEO version number
-          OSGEO_VERSION=$(\
-            curl -Ls https://download.osgeo.org/postgis/windows/pg${{ matrix.pg_major }} |
-            sed -n 's/.*>postgis-bundle-pg${{ matrix.pg_major }}-\(${{ env.postgis_version }}.[0-9]*.[0-9]*\)x64.zip<.*/\1/p' |
-            tail -n 1)
-          if [ -z "$OSGEO_VERSION" ]; then
-              OSGEO_VERSION=$(\
-                curl -Ls https://download.osgeo.org/postgis/windows/pg${{ matrix.pg_major }}/archive |
-                sed -n 's/.*>postgis-bundle-pg${{ matrix.pg_major }}-\(${{ env.postgis_version }}.[0-9]*.[0-9]*\)x64.zip<.*/\1/p' |
-                tail -n 1)
-              POSTGIS_PATH="archive/"
-          else
-              POSTGIS_PATH=""
-          fi
-
-          # Install PostGIS
-          echo "Installing PostGIS (version: ${OSGEO_VERSION})"
-          POSTGIS_FILE="postgis-bundle-pg${{ matrix.pg_major }}-${OSGEO_VERSION}x64"
-          curl -o postgis.zip -L https://download.osgeo.org/postgis/windows/pg${{ matrix.pg_major }}/${POSTGIS_PATH}${POSTGIS_FILE}.zip
-          unzip postgis.zip -d postgis
-          cp -a postgis/$POSTGIS_FILE/. pgsql/
-
           # Start PostgreSQL
           pgsql/bin/initdb -D pgsql/PGDATA -E UTF8 -U postgres
           SOCKET_DIR=$(echo "$LOCALAPPDATA\Temp" | sed 's|\\|/|g')
diff --git a/test/Npgsql.Tests/TestUtil.cs b/test/Npgsql.Tests/TestUtil.cs
@@ -100,9 +100,6 @@ public static async Task IgnoreOnRedshift(NpgsqlConnection conn, string? ignoreT
         }
     }
 
-    public static async Task<bool> IsPgPrerelease(NpgsqlConnection conn)
-        => ((string) (await conn.ExecuteScalarAsync("SELECT version()"))!).Contains("beta");
-
     public static void EnsureExtension(NpgsqlConnection conn, string extension, string? minVersion = null)
         => EnsureExtension(conn, extension, minVersion, async: false).GetAwaiter().GetResult();
 
@@ -168,21 +165,19 @@ static async Task IgnoreIfFeatureNotSupported(NpgsqlConnection conn, string test
 
     public static async Task EnsurePostgis(NpgsqlConnection conn)
     {
-        var isPreRelease = await IsPgPrerelease(conn);
         try
         {
             await EnsureExtensionAsync(conn, "postgis");
         }
-        catch (PostgresException e) when (e.SqlState == PostgresErrorCodes.UndefinedFile)
+        catch (PostgresException)
         {
-            // PostGIS packages aren't available for PostgreSQL prereleases
-            if (isPreRelease)
+            if (Environment.GetEnvironmentVariable("NPGSQL_TEST_POSTGIS")?.ToLower(CultureInfo.InvariantCulture) is "1" or "true")
             {
-                Assert.Ignore($"PostGIS could not be installed, but PostgreSQL is prerelease ({conn.ServerVersion}), ignoring test suite.");
+                throw;
             }
             else
             {
-                throw;
+                Assert.Ignore($"PostGIS isn't installed, skipping tests.");
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -100,9 +100,6 @@ public static async Task IgnoreOnRedshift(NpgsqlConnection conn, string? ignoreT`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`
`103`		`- public static async Task<bool> IsPgPrerelease(NpgsqlConnection conn)`
`104`		`- => ((string) (await conn.ExecuteScalarAsync("SELECT version()"))!).Contains("beta");`
`105`		`-`
`106`	`103`	`public static void EnsureExtension(NpgsqlConnection conn, string extension, string? minVersion = null)`
`107`	`104`	`=> EnsureExtension(conn, extension, minVersion, async: false).GetAwaiter().GetResult();`
`108`	`105`
`@@ -168,21 +165,19 @@ static async Task IgnoreIfFeatureNotSupported(NpgsqlConnection conn, string test`
`168`	`165`
`169`	`166`	`public static async Task EnsurePostgis(NpgsqlConnection conn)`
`170`	`167`	`{`
`171`		`- var isPreRelease = await IsPgPrerelease(conn);`
`172`	`168`	`try`
`173`	`169`	`{`
`174`	`170`	`await EnsureExtensionAsync(conn, "postgis");`
`175`	`171`	`}`
`176`		`- catch (PostgresException e) when (e.SqlState == PostgresErrorCodes.UndefinedFile)`
	`172`	`+ catch (PostgresException)`
`177`	`173`	`{`
`178`		`- // PostGIS packages aren't available for PostgreSQL prereleases`
`179`		`- if (isPreRelease)`
	`174`	`+ if (Environment.GetEnvironmentVariable("NPGSQL_TEST_POSTGIS")?.ToLower(CultureInfo.InvariantCulture) is "1" or "true")`
`180`	`175`	`{`
`181`		`- Assert.Ignore($"PostGIS could not be installed, but PostgreSQL is prerelease ({conn.ServerVersion}), ignoring test suite.");`
	`176`	`+ throw;`
`182`	`177`	`}`
`183`	`178`	`else`
`184`	`179`	`{`
`185`		`- throw;`
	`180`	`+ Assert.Ignore($"PostGIS isn't installed, skipping tests.");`
`186`	`181`	`}`
`187`	`182`	`}`
`188`	`183`	`}`