-
-
Notifications
You must be signed in to change notification settings - Fork 113
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
install libssh2 and use system openssl
- Loading branch information
Showing
3 changed files
with
30 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -134,7 +134,7 @@ jobs: | |
qt_arch: gcc_64 | ||
openssl_arch: linux-x86_64 | ||
ld_library_arch: linux-x86-64 | ||
cmake_flags: "-DGENERATE_APPDATA=ON -DCMAKE_INSTALL_PREFIX=/usr -DUSE_SYSTEM_QT=ON -DENABLE_UPDATE_OVER_GUI=OFF -DUSE_SSH -DUSE_SYSTEM_LIBSSH2 -DUSE_SYSTEM_OPENSSL" | ||
cmake_flags: "-DGENERATE_APPDATA=ON -DCMAKE_INSTALL_PREFIX=/usr -DUSE_SYSTEM_QT=ON -DENABLE_UPDATE_OVER_GUI=OFF -DUSE_SSH=ON -DUSE_SYSTEM_LIBSSH2=ON -DUSE_SYSTEM_OPENSSL=ON" | ||
pack: 0 | ||
cmake_env: {} | ||
|
||
|
@@ -199,6 +199,12 @@ jobs: | |
with: | ||
perl-version: '5.30' | ||
|
||
- name: Install Libssh2 | ||
if: matrix.env.ninja_platform == 'linux' | ||
run: | | ||
sudo apt-get update | ||
sudo apt-get -y install libssh2-1 | ||
- name: Install Qt | ||
uses: jurplel/[email protected] | ||
timeout-minutes: 10 | ||
|
@@ -240,12 +246,12 @@ jobs: | |
if: matrix.env.ninja_platform == 'win' | ||
uses: ilammy/[email protected] | ||
|
||
- name: Build OpenSSL (Linux) | ||
if: matrix.env.ninja_platform == 'linux' | ||
run: | | ||
cd dep/openssl/openssl | ||
./config -fPIC | ||
make | ||
#- name: Build OpenSSL (Linux) | ||
# if: matrix.env.ninja_platform == 'linux' | ||
# run: | | ||
# cd dep/openssl/openssl | ||
# ./config -fPIC | ||
# make | ||
|
||
- name: Build OpenSSL (macOS) | ||
if: matrix.env.ninja_platform == 'mac' | ||
|
@@ -431,3 +437,4 @@ jobs: | |
branch: gh-pages # The branch the action should deploy to. | ||
folder: docs # The folder the action should deploy. | ||
... | ||
... |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,4 +11,4 @@ build | |
.idea/ | ||
.venv | ||
compile_commands.json | ||
tags | ||
.flatpak-builder |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters