GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-15 00:05:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Split up OpenSSL install and copy

Browse Source 
Contributes to CURA-9365
This commit is contained in:
j.spijker@ultimaker.com 2022-07-13 16:32:18 +02:00 committed by Jelle Spijker
parent 81aa56c259
commit 6b31e6a776
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/cura-installer.yml vendored
View File

@ -167,17 +167,19 @@ jobs:
# OpenSSL statically for CPython, but our Python Dependenies (such as PyQt6) require a shared library. # 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 # 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. # 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) - name: Install OpenSSL shared (Bash)
if: ${{ runner.os != 'Windows' }} if: ${{ runner.os != 'Windows' }}
run: | run: |
conan install openssl/1.1.1l@_/_ --build=missing --update -o openssl:shared=True -g deploy cp ./openssl/lib/*.so* ./cura_inst/bin/
cp openssl/lib/*.so* ./cura_inst/bin/ 2> /dev/null cp ./openssl/lib/*.dylib* ./cura_inst/bin/
cp openssl/lib/*.dylib* ./cura_inst/bin/ 2> /dev/null
- name: Install OpenSSL shared (Powershell) - name: Install OpenSSL shared (Powershell)
if: ${{ runner.os == 'Windows' }} if: ${{ runner.os == 'Windows' }}
run: | 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/bin/*.dll ./cura_inst/Scripts/
cp openssl/lib/*.lib ./cura_inst/Lib/ cp openssl/lib/*.lib ./cura_inst/Lib/