Skip to content

Commit e7aa407

Browse files
authored
Update OS versions for CI (#6502)
1 parent 32b2b7d commit e7aa407

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ jobs:
4040
pg_major: 18
4141
config: Debug
4242
test_tfm: net10.0
43-
- os: macos-15
43+
- os: macos-26
4444
pg_major: 16
4545
config: Release
4646
test_tfm: net10.0
47-
- os: windows-2022
47+
- os: windows-2025
4848
pg_major: 18
4949
config: Release
5050
test_tfm: net10.0
@@ -66,11 +66,11 @@ jobs:
6666
is_release: ${{ steps.analyze_tag.outputs.is_release }}
6767
is_prerelease: ${{ steps.analyze_tag.outputs.is_prerelease }}
6868

69-
# Installing PostGIS on Windows is complicated/unreliable, so we don't test on it.
69+
# Installing PostGIS on Windows/macOS is complicated/unreliable, so we don't test on it.
7070
# The NPGSQL_TEST_POSTGIS environment variable ensures that if PostGIS isn't installed,
7171
# the PostGIS tests fail and therefore fail the build.
7272
env:
73-
NPGSQL_TEST_POSTGIS: ${{ !startsWith(matrix.os, 'windows') }}
73+
NPGSQL_TEST_POSTGIS: ${{ !startsWith(matrix.os, 'windows') && !startsWith(matrix.os, 'macos') }}
7474

7575
steps:
7676
- name: Checkout
@@ -315,7 +315,6 @@ jobs:
315315
**/*_Sequence.xml
316316
317317
- name: Test Plugins
318-
if: "!startsWith(matrix.os, 'macos')"
319318
run: |
320319
if [ -z "${{ matrix.pg_prerelease }}" ]; then
321320
dotnet test -c ${{ matrix.config }} -f ${{ matrix.test_tfm }} test/Npgsql.PluginTests --logger "GitHubActions;report-warnings=false"

0 commit comments

Comments
 (0)