Skip to content

Commit a955616

Browse files
committed
Merge branch 'openapi' into oa/existing-integration
2 parents b3cdc7a + 9209642 commit a955616

File tree

2 files changed

+19
-5
lines changed

2 files changed

+19
-5
lines changed

appveyor.yml

+18-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ image:
44

55
version: '{build}'
66

7-
stack: postgresql
7+
stack: postgresql 13.4
88

99
environment:
1010
PGUSER: postgres
@@ -35,7 +35,10 @@ for:
3535
only:
3636
- image: Visual Studio 2019
3737
services:
38-
- postgresql101
38+
- postgresql134
39+
# https://help.appveyor.com/discussions/problems/30239-postgres-fails-to-connect-after-version-change
40+
init:
41+
- net start postgresql-x64-13
3942
# REF: https://github.com/docascode/docfx-seed/blob/master/appveyor.yml
4043
before_build:
4144
- pwsh: |
@@ -93,7 +96,18 @@ for:
9396
appveyor_repo_tag: true
9497

9598
build_script:
96-
- pwsh: dotnet --version
97-
- pwsh: .\Build.ps1
99+
- pwsh: |
100+
Write-Output ".NET version:"
101+
dotnet --version
102+
103+
Write-Output "PostgreSQL version:"
104+
if ($IsWindows) {
105+
. "${env:ProgramFiles}\PostgreSQL\13\bin\psql" --version
106+
}
107+
else {
108+
psql --version
109+
}
110+
111+
.\Build.ps1
98112
99113
test: off

run-docker-postgres.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ docker run --rm --name jsonapi-dotnet-core-testing `
99
-e POSTGRES_USER=postgres `
1010
-e POSTGRES_PASSWORD=postgres `
1111
-p 5432:5432 `
12-
postgres:12.0
12+
postgres:13.4

0 commit comments

Comments
 (0)