Skip to content

Commit b744235

Browse files
apgruczaapgrucza
authored
Fix warnings about caches not being saved (#20)
1 parent ab2fe11 commit b744235

File tree

1 file changed

+33
-28
lines changed

1 file changed

+33
-28
lines changed

‎.github/workflows/main.yml‎

Lines changed: 33 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -45,22 +45,22 @@ jobs:
4545
path: |
4646
d:\postgresql
4747
d:\postgresql86
48-
key: postgresql-${{env.POSTGRESQL_SOURCE_TAG}}_openssl-${{env.OPENSSL_VERSION}}_pkgconfiglite-${{env.PKGCONFIGLITE_VERSION}}_winflexbison-${{env.WINFLEXBISON_VERSION}}_workflow-${{env.WORKFLOW_VERSION}}
48+
key: postgresql-${{env.POSTGRESQL_SOURCE_TAG}}_openssl-${{env.OPENSSL_VERSION}}_pkgconfiglite-${{env.PKGCONFIGLITE_VERSION}}_winflexbison-${{env.WINFLEXBISON_VERSION}}_workflow-${{env.WORKFLOW_VERSION_POSTGRESQL}}
4949

5050
- name: Cache Postgres source
5151
if: ${{steps.cachePostgres.outputs.cache-hit != 'true'}}
5252
uses: actions/cache@v4
5353
id: cachePostgresSource
5454
with:
55-
path: postgresql
56-
key: postgresql-${{env.POSTGRESQL_SOURCE_TAG}}-source
55+
path: postgres
56+
key: postgres-source-${{env.POSTGRESQL_SOURCE_TAG}}
5757
- name: Get Postgres source
5858
uses: actions/checkout@v4
5959
if: ${{steps.cachePostgresSource.outputs.cache-hit != 'true' && steps.cachePostgres.outputs.cache-hit != 'true'}}
6060
with:
6161
repository: "postgres/postgres.git"
6262
ref: ${{env.POSTGRESQL_SOURCE_TAG}}
63-
path: postgresql
63+
path: postgres
6464

6565
- name: 'get meson'
6666
if: ${{steps.cachePostgres.outputs.cache-hit != 'true'}}
@@ -202,12 +202,12 @@ jobs:
202202
- name: Install Win32OpenSSL
203203
if: ${{steps.cacheWin32OpenSSL.outputs.cache-hit != 'true' && steps.cachePostgres.outputs.cache-hit != 'true'}}
204204
shell: cmd
205-
run: Win32OpenSSL.exe /sp /silent /dir=c:\openssl32
205+
run: Win32OpenSSL.exe /sp /silent /dir=c:\OTHERBIN\openssl32
206206

207207
- name: Install Win64OpenSSL
208208
if: ${{steps.cacheWin64OpenSSL.outputs.cache-hit != 'true' && steps.cachePostgres.outputs.cache-hit != 'true'}}
209209
shell: cmd
210-
run: Win64OpenSSL.exe /sp /silent /dir=c:\openssl64
210+
run: Win64OpenSSL.exe /sp /silent /dir=c:\OTHERBIN\openssl64
211211

212212
# Choco Install winflexbison
213213
# BUT the "crazy-max/ghaction-chocolatey@v2" "install pkgconfiglite" file download often times-out
@@ -233,27 +233,27 @@ jobs:
233233
arch: x86
234234
- name: 'build postgresx86'
235235
if: ${{steps.cachePostgres.outputs.cache-hit != 'true'}}
236-
working-directory: postgresql
236+
working-directory: postgres
237237
run: |
238-
meson setup buildx86 -Dssl=openssl -Dextra_lib_dirs=c:\openssl32\lib\VC\x86\MT -Dextra_include_dirs=c:\openssl32\include --prefix=d:\postgresql86
238+
meson setup buildx86 -Dssl=openssl -Dextra_lib_dirs=c:\OTHERBIN\openssl32\lib\VC\x86\MT -Dextra_include_dirs=c:\OTHERBIN\openssl32\include --prefix=d:\postgresql86
239239
cd buildx86
240240
ninja -v
241241
ninja -v install
242-
cp c:\openssl32\*.dll d:\postgresql86\bin
242+
cp c:\OTHERBIN\openssl32\*.dll d:\postgresql86\bin
243243
- name: 'setup msvc x64'
244244
if: ${{steps.cachePostgres.outputs.cache-hit != 'true'}}
245245
uses: TheMrMilchmann/setup-msvc-dev@v3
246246
with:
247247
arch: x64
248248
- name : 'build postgres x64'
249249
if: ${{steps.cachePostgres.outputs.cache-hit != 'true'}}
250-
working-directory: postgresql
250+
working-directory: postgres
251251
run: |
252-
meson setup build -Dssl=openssl -Dextra_lib_dirs=c:\openssl64\lib\VC\x64\MT -Dextra_include_dirs=c:\openssl64\include --prefix=d:\postgresql
252+
meson setup build -Dssl=openssl -Dextra_lib_dirs=c:\OTHERBIN\openssl64\lib\VC\x64\MT -Dextra_include_dirs=c:\OTHERBIN\openssl64\include --prefix=d:\postgresql
253253
cd build
254254
ninja
255255
ninja install
256-
cp c:\openssl64\*.dll d:\postgresql\bin
256+
cp c:\OTHERBIN\openssl64\*.dll d:\postgresql\bin
257257
- name: install postgresql binary
258258
shell: cmd
259259
run: |
@@ -267,6 +267,7 @@ jobs:
267267
- name: get psqlodbc
268268
uses: actions/checkout@v4
269269
with:
270+
path: psqlodbc
270271
submodules: true
271272
- name: 'setup msvc for psqlodbc'
272273
uses: TheMrMilchmann/setup-msvc-dev@v3
@@ -275,107 +276,111 @@ jobs:
275276

276277
- name: build psqlodbc standard
277278
shell: powershell
279+
working-directory: psqlodbc
278280
run: |
279281
copy .github\workflows\configuration.xml winbuild
280282
winbuild\BuildAll.ps1
281283
installer\buildInstallers.ps1
282284
env:
283-
PSQLODBC_OBJBASE: ${{ github.workspace }}\winbuild\standard
285+
PSQLODBC_OBJBASE: ${{ github.workspace }}\psqlodbc\winbuild\standard
284286
- name: test psqlodbc standard
285287
shell: powershell
288+
working-directory: psqlodbc
286289
run: |
287290
winbuild\regress.ps1 -DsnInfo "SERVER=localhost|DATABASE=contrib_regression|PORT=5432|UID=postgres|PWD=password"
288291
standard\test_x86\RegisterRegdsn.exe uninstall_driver postgres_devw
289292
standard\test_x64\RegisterRegdsn.exe uninstall_driver postgres_devw
290293
env:
291-
PSQLODBC_OBJBASE: ${{ github.workspace }}\winbuild\standard
294+
PSQLODBC_OBJBASE: ${{ github.workspace }}\psqlodbc\winbuild\standard
292295

293296
- name: build psqlodbc mimalloc
294297
shell: powershell
298+
working-directory: psqlodbc
295299
run: |
296300
copy .github\workflows\configuration.xml winbuild
297301
winbuild\BuildAll.ps1 -UseMimalloc
298302
installer\buildInstallers.ps1
299303
env:
300-
PSQLODBC_OBJBASE: ${{ github.workspace }}\winbuild\mimalloc
304+
PSQLODBC_OBJBASE: ${{ github.workspace }}\psqlodbc\winbuild\mimalloc
301305
- name: test psqlodbc mimalloc
302306
shell: powershell
307+
working-directory: psqlodbc
303308
run: |
304309
winbuild\regress.ps1 -DsnInfo "SERVER=localhost|DATABASE=contrib_regression|PORT=5432|UID=postgres|PWD=password" -ExpectMimalloc
305310
mimalloc\test_x86\RegisterRegdsn.exe uninstall_driver postgres_devw
306311
mimalloc\test_x64\RegisterRegdsn.exe uninstall_driver postgres_devw
307312
env:
308-
PSQLODBC_OBJBASE: ${{ github.workspace }}\winbuild\mimalloc
313+
PSQLODBC_OBJBASE: ${{ github.workspace }}\psqlodbc\winbuild\mimalloc
309314

310315
- name: Upload standard x64 merge module
311316
uses: actions/upload-artifact@v4
312317
with:
313318
name: psqlODBC Standard x64 Merge Module
314-
path: winbuild/standard/installer/x64/*.msm
319+
path: psqlodbc/winbuild/standard/installer/x64/*.msm
315320
retention-days: 5
316321
if-no-files-found: error
317322
- name: Upload standard x64 installer package
318323
uses: actions/upload-artifact@v4
319324
with:
320325
name: psqlODBC Standard x64 Installer
321-
path: winbuild/standard/installer/x64/*.msi
326+
path: psqlodbc/winbuild/standard/installer/x64/*.msi
322327
retention-days: 5
323328
if-no-files-found: error
324329
- name: Upload standard x86 merge module
325330
uses: actions/upload-artifact@v4
326331
with:
327332
name: psqlODBC Standard x86 Merge Module
328-
path: winbuild/standard/installer/x86/*.msm
333+
path: psqlodbc/winbuild/standard/installer/x86/*.msm
329334
retention-days: 5
330335
if-no-files-found: error
331336
- name: Upload standard x86 installer package
332337
uses: actions/upload-artifact@v4
333338
with:
334339
name: psqlODBC Standard x86 Installer
335-
path: winbuild/standard/installer/x86/*.msi
340+
path: psqlodbc/winbuild/standard/installer/x86/*.msi
336341
retention-days: 5
337342
if-no-files-found: error
338343
- name: Upload standard x64 setup
339344
uses: actions/upload-artifact@v4
340345
with:
341346
name: psqlODBC Standard x64 Setup
342-
path: winbuild/standard/installer/psqlodbc-setup/bin/Release/psqlodbc-setup.exe
347+
path: psqlodbc/winbuild/standard/installer/psqlodbc-setup/bin/Release/psqlodbc-setup.exe
343348
retention-days: 5
344349
if-no-files-found: error
345350

346351
- name: Upload mimalloc x64 merge module
347352
uses: actions/upload-artifact@v4
348353
with:
349354
name: psqlODBC mimalloc x64 Merge Module
350-
path: winbuild/mimalloc/installer/x64/*.msm
355+
path: psqlodbc/winbuild/mimalloc/installer/x64/*.msm
351356
retention-days: 5
352357
if-no-files-found: error
353358
- name: Upload mimalloc x64 installer package
354359
uses: actions/upload-artifact@v4
355360
with:
356361
name: psqlODBC mimalloc x64 Installer
357-
path: winbuild/mimalloc/installer/x64/*.msi
362+
path: psqlodbc/winbuild/mimalloc/installer/x64/*.msi
358363
retention-days: 5
359364
if-no-files-found: error
360365
- name: Upload mimalloc x86 merge module
361366
uses: actions/upload-artifact@v4
362367
with:
363368
name: psqlODBC mimalloc x86 Merge Module
364-
path: winbuild/mimalloc/installer/x86/*.msm
369+
path: psqlodbc/winbuild/mimalloc/installer/x86/*.msm
365370
retention-days: 5
366371
if-no-files-found: error
367372
- name: Upload mimalloc x86 installer package
368373
uses: actions/upload-artifact@v4
369374
with:
370375
name: psqlODBC mimalloc x86 Installer
371-
path: winbuild/mimalloc/installer/x86/*.msi
376+
path: psqlodbc/winbuild/mimalloc/installer/x86/*.msi
372377
retention-days: 5
373378
if-no-files-found: error
374379
- name: Upload mimalloc x64 setup
375380
uses: actions/upload-artifact@v4
376381
with:
377382
name: psqlODBC mimalloc x64 Setup
378-
path: winbuild/mimalloc/installer/psqlodbc-setup/bin/Release/psqlodbc-setup.exe
383+
path: psqlodbc/winbuild/mimalloc/installer/psqlodbc-setup/bin/Release/psqlodbc-setup.exe
379384
retention-days: 5
380385
if-no-files-found: error
381386

@@ -391,7 +396,7 @@ jobs:
391396
draft: false
392397
prerelease: false
393398
token: ${{secrets.RELEASE_TOKEN}}
394-
artifacts: "winbuild/mimalloc/installer/x64/*.ms?,winbuild/mimalloc/installer/x86/*.ms?,winbuild/mimalloc/installer/psqlodbc-setup/bin/Release/psqlodbc-setup.exe"
399+
artifacts: "psqlodbc/winbuild/mimalloc/installer/x64/*.ms?,psqlodbc/winbuild/mimalloc/installer/x86/*.ms?,psqlodbc/winbuild/mimalloc/installer/psqlodbc-setup/bin/Release/psqlodbc-setup.exe"
395400
- name: Create Standard Release
396401
if: startsWith(github.ref, 'refs/tags/REL-')
397402
uses: ncipollo/[email protected]
@@ -401,4 +406,4 @@ jobs:
401406
draft: false
402407
prerelease: false
403408
token: ${{secrets.RELEASE_TOKEN}}
404-
artifacts: "winbuild/standard/installer/x64/*.ms?,winbuild/standard/installer/x86/*.ms?,winbuild/standard/installer/psqlodbc-setup/bin/Release/psqlodbc-setup.exe"
409+
artifacts: "psqlodbc/winbuild/standard/installer/x64/*.ms?,psqlodbc/winbuild/standard/installer/x86/*.ms?,psqlodbc/winbuild/standard/installer/psqlodbc-setup/bin/Release/psqlodbc-setup.exe"

0 commit comments

Comments
 (0)