Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:

# PostgreSQL build from source.
POSTGRESQL_SOURCE_TAG: 'REL_18_STABLE'
OPENSSL_VERSION: '3_5_6'
OPENSSL_VERSION: '3_5_7'
PKGCONFIGLITE_VERSION: '0.28-1'
WINFLEXBISON_VERSION: '2.5.24'
WORKFLOW_VERSION_POSTGRESQL: '1' # increment to invalidate cache
Expand Down Expand Up @@ -305,6 +305,8 @@ jobs:
echo on
C:\OTHERBIN\postgresql_install.exe --mode unattended --unattendedmodeui none --superpassword password --enable-components server
sc config "postgresql-x64-17" start= auto
sc start "postgresql-x64-17"
ping -n 6 127.0.0.1 >nul

# -----------------------------------------------------------------
# Build and test psqlodbc
Expand Down
2 changes: 1 addition & 1 deletion psqlodbc.h
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ typedef struct QueryInfo_
/* Used to save the error information */
typedef struct
{
UInt4 status;
Int4 status; /* statement warnings are negative */
UInt4 errsize;
UInt4 errpos;
UInt2 recsize;
Expand Down
1 change: 1 addition & 0 deletions winbuild/BuildAll.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ function buildPlatform([xml]$configInfo, [string]$Platform)
"15.0" { $mimallocIdeDir = "vs2017" }
"16.0" { $mimallocIdeDir = "vs2019" }
"17.0" { $mimallocIdeDir = "vs2022" }
"18.0" { $mimallocIdeDir = "vs2022" }
default { throw "Unable to resolve mimalloc IDE directory for VC ${VCVersion}."}
}

Expand Down
2 changes: 2 additions & 0 deletions winbuild/MSProgram-Get.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ function Find-MSBuild
"15.0" { $toolsout = 15 }
"16.0" { $toolsout = 16 }
"17.0" { $toolsout = 17 }
"18.0" { $toolsout = 18 }
default { throw "Selected Visual Studio is Version ${VisualStudioVersion}. Please use VC10 or later"}
}
#
Expand Down Expand Up @@ -154,6 +155,7 @@ function Find-MSBuild
"15.0" {$Toolsetv="v141_xp"}
"16.0" {$Toolsetv="v142"}
"17.0" {$Toolsetv="v143"}
"18.0" {$Toolsetv="v145"}
}
}
# avoid a bug of Windows7.1SDK PlatformToolset
Expand Down
Loading