Skip to content

Commit

Permalink
install libssh2 and use system openssl
Browse files Browse the repository at this point in the history
  • Loading branch information
Murmele committed Jun 11, 2024
1 parent 682123c commit e60180d
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 8 deletions.
21 changes: 14 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -431,3 +437,4 @@ jobs:
branch: gh-pages # The branch the action should deploy to.
folder: docs # The folder the action should deploy.
...
...
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ build
.idea/
.venv
compile_commands.json
tags
.flatpak-builder
15 changes: 15 additions & 0 deletions com.github.Murmele.Gittyup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,21 @@ modules:
- install -Dm755 $(which git-upload-archive) ${FLATPAK_DEST}/bin/
- install -Dm755 $(which git-upload-pack) ${FLATPAK_DEST}/bin/

- name: libssh2
rm-configure: true
sources:
- type: archive
url: https://www.libssh2.org/download/libssh2-1.11.0.tar.gz
sha256: 3736161e41e2693324deb38c26cfdc3efe6209d634ba4258db1cecff6a5ad461
x-checker-data:
type: anitya
project-id: 1730
url-template: https://www.libssh2.org/download/libssh2-$version.tar.gz
- type: script
commands:
- autoreconf -fiv
dest-filename: autogen.sh

- name: Gittyup
buildsystem: cmake-ninja
config-opts: [-DCMAKE_BUILD_TYPE=Release, -DFLATPAK=ON, -DGENERATE_APPDATA=ON, -DENABLE_UPDATE_OVER_GUI=OFF, -DUSE_SYSTEM_OPENSSL:BOOL=ON, -DUSE_SSH=ON -DUSE_SYSTEM_LIBSSH2=ON]
Expand Down

0 comments on commit e60180d

Please sign in to comment.