From 6b31e6a7763f10aac580e16bfe83869ae34cea4f Mon Sep 17 00:00:00 2001
From: "j.spijker@ultimaker.com" <jelle spijker>
Date: Wed, 13 Jul 2022 16:32:18 +0200
Subject: [PATCH] Split up OpenSSL install and copy

Contributes to CURA-9365
---
 .github/workflows/cura-installer.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/cura-installer.yml b/.github/workflows/cura-installer.yml
index 78a698f50f..c0fa15564c 100644
--- a/.github/workflows/cura-installer.yml
+++ b/.github/workflows/cura-installer.yml
@@ -167,17 +167,19 @@ jobs:
                 #  OpenSSL statically for CPython, but our Python Dependenies (such as PyQt6) require a shared library.
                 #  Because Conan won't allow for building the same library with two different options (easily) we need to install it explicitly
                 #  and do a manual copy to the VirtualEnv, such that Pyinstaller can find it.
+
+            -   name: Install OpenSSL shared
+                run: conan install openssl/1.1.1l@_/_ --build=missing --update -o openssl:shared=True -g deploy
+
             -   name: Install OpenSSL shared (Bash)
                 if: ${{ runner.os != 'Windows' }}
                 run: |
-                    conan install openssl/1.1.1l@_/_ --build=missing --update -o openssl:shared=True -g deploy
-                    cp openssl/lib/*.so* ./cura_inst/bin/ 2> /dev/null
-                    cp openssl/lib/*.dylib* ./cura_inst/bin/ 2> /dev/null                    
+                    cp ./openssl/lib/*.so* ./cura_inst/bin/
+                    cp ./openssl/lib/*.dylib* ./cura_inst/bin/                    
 
             -   name: Install OpenSSL shared (Powershell)
                 if: ${{ runner.os == 'Windows' }}
                 run: |
-                    conan install openssl/1.1.1l@_/_ --build=missing --update -o openssl:shared=True -g deploy
                     cp openssl/bin/*.dll ./cura_inst/Scripts/
                     cp openssl/lib/*.lib ./cura_inst/Lib/