Skip to content

Commit aafe000

Browse files
committed
download win32openssl and build with it
1 parent 2a1e07e commit aafe000

File tree

2 files changed

+20
-3
lines changed

2 files changed

+20
-3
lines changed

.github/workflows/main.yml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,12 @@ jobs:
6868
key: pkg-config-lite-0.28-1_bin-win32.zip
6969
env:
7070
SEGMENT_DOWNLOAD_TIMEOUT_MINS: 1
71-
71+
- name: Cache Win32OpenSSL32 for Win32Compile
72+
uses: actions/cache@v4
73+
id: cacheWin32OpenSSL-3_3
74+
with:
75+
path: C:\OTHERBIN\openssl32
76+
key: Win32OpenSSL-3_3_0.exe
7277
- name: Cache winflexbison for Compile using msvc
7378
uses: actions/cache@v4
7479
id: cacheWinFlexBisonZip
@@ -84,6 +89,14 @@ jobs:
8489
with:
8590
retry-times: 5
8691
url: https://zenlayer.dl.sourceforge.net/project/gnuwin32/diffutils/2.8.7-1/diffutils-2.8.7-1-bin.zip
92+
93+
- name: Download openssl32 for win32 compile
94+
if: ${{steps.cacheWin32OpenSSL.outputs.cache-hit != 'true'}}
95+
uses: suisei-cn/actions-download-file@v1.6.0
96+
id: downloadWin32OpenSSL3_3_3
97+
with:
98+
retry-times: 5
99+
url: https://slproweb.com/download/Win32OpenSSL-3_3_0.exe
87100

88101
- name: Download pkgconfiglite for Compile using msvc and meson
89102
if: ${{steps.cachePkgConfigLiteZip.outputs.cache-hit != 'true'}}
@@ -135,6 +148,10 @@ jobs:
135148
rem - man7.org/linux/man-pages/man1/printf.1.html
136149
printf "C:\\OTHERBIN\\pkgconfiglite\\pkg-config-lite-0.28-1\\bin" >> %GITHUB_PATH%
137150
151+
- name: Install Win32OpenSSL
152+
shell: cmd
153+
run: Win32OpenSSL-3_3_0.exe /sp /silent /dir=c:\openssl32
154+
138155
# Choco Install winflexbison
139156
# BUT the "crazy-max/ghaction-chocolatey@v2" "install pkgconfiglite" file download often times-out
140157
- name: Extract winflexbison and add the winflexbison directory to the PATH for Compile using msvc
@@ -156,10 +173,11 @@ jobs:
156173
- name: 'build postgresx86'
157174
if: ${{steps.cachePostgres86.outputs.cache-hit != 'true'}}
158175
run: |
159-
meson setup buildx86 --prefix=d:\postgresql86
176+
meson setup buildx86 -Dopenssl=c:\openssl32 --prefix=d:\postgresql86
160177
cd buildx86
161178
ninja -v
162179
ninja -v install
180+
cp c:\openssl32\*.dll d:\postgresql86\bin
163181
- name: 'setup msvc x64'
164182
if: ${{steps.cachePostgres.outputs.cache-hit != 'true'}}
165183
uses: TheMrMilchmann/setup-msvc-dev@v3

winbuild/MSProgram-Get.psm1

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,6 @@ function Find-Dumpbin
275275
}
276276
}
277277

278-
Write-Host "Dumpbin=$dumpbinexe"
279278
Set-Variable -Name dumpbinexe -Value $dumpbinexe -Scope 1
280279
Set-Variable -Name addPath -Value $addPath -Scope 1
281280
if ("$addPath" -ne "") {

0 commit comments

Comments
 (0)