try to fix libpsql.dll installation for windows VII #929 (#931)

* try to fix libpsql.dll installation for windows VII #929 * try to fix libpsql.dll installation for windows VIII #929 * test * test 2 * test 3 * test 8 * test 9 * test 11 * test 12 * test 13 * test 14 * Update installer.yml * Update installer.yml * Update installer.yml * Update installer.yml * Update installer.yml --------- Co-authored-by: Fanda Vacek <[email protected]>
Quick-Event · Jul 10, 2023 · 3ea749b · 3ea749b
1 parent ef7ec08
commit 3ea749b
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/.github/workflows/installer.yml b/.github/workflows/installer.yml
@@ -2,9 +2,9 @@ name: Installer
 
 on:
   push:
-    branches: [ "master", "qt6" ]
+    branches: [ "master", "qt6", "qt6-test" ]
   pull_request:
-    branches: [ "master", "qt6" ]
+    branches: [ "master" ]
 
 jobs:
   windows:
@@ -21,16 +21,19 @@ jobs:
         uses: actions/cache@v3
         with:
           path: |
+            C:/openssl/bin/libssl-1_1-x64.dll
+            C:/openssl/bin/libcrypto-1_1-x64.dll
             C:/Program Files/PostgreSQL/14/bin/libiconv-2.dll
             C:/Program Files/PostgreSQL/14/bin/libintl-9.dll
             C:/Program Files/PostgreSQL/14/bin/liblz4.dll
             C:/Program Files/PostgreSQL/14/bin/zlib1.dll
             C:/Program Files/PostgreSQL/14/bin/libpq.dll
-          key: ${{ runner.os }}-Libraries
+          key: ${{ runner.os }}-library-cache
 
-      - name: Get PostgreSQL libraries
+      - name: Get libraries
         if: steps.cache-libs.outputs.cache-hit != 'true'
         run: |
+          choco install openssl.light --params "/InstallDir:C:\openssl" --version 1.1.1 -y
           choco install postgresql14 --version 14.5.1 -y
         shell: cmd
 
@@ -58,11 +61,11 @@ jobs:
         shell: bash
 
       - name: Copy PostgreSQL runtime libraries
-        run: 
-          - ls Program\ Files
-          - ls Program\ Files/PostgreSQL
-          - ls Program\ Files/PostgreSQL/14
-          - cp "Program\ Files/PostgreSQL/14/bin/{libiconv-2.dll,libintl-9.dll,liblz4.dll,zlib1.dll,libpq.dll}" '${{ github.workspace }}/install/bin'
+        run: |
+          cd "C:/Program Files/PostgreSQL/14/bin"
+          cp libiconv-2.dll libintl-9.dll liblz4.dll zlib1.dll libpq.dll '${{ github.workspace }}/install/bin/'
+          cd "C:\openssl"
+          cp libssl-1_1-x64.dll libcrypto-1_1-x64.dll '${{ github.workspace }}/install/bin/'
         shell: bash
 
       - name: Get app version