10000 ci: add a libssh pipeline, and force usage of libssh2 · libgit2/libgit2@0dce737 · GitHub
[go: up one dir, main page]
Skip to content

Commit 0dce737

Browse files
tiennoutiennou
committed
ci: add a libssh pipeline, and force usage of libssh2
1 parent 8f3deb3 commit 0dce737

File tree

3 files changed

+34
-5
lines changed

3 files changed

+34
-5
lines changed

‎.github/workflows/main.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,13 @@ jobs:
7979
strategy:
8080
matrix:
8181
platform:
82-
- # Xenial, GCC, OpenSSL
82+
- # Xenial, GCC, OpenSSL, LibSSH2
8383
container:
8484
name: xenial
8585
env:
8686
CC: gcc
8787
CMAKE_GENERATOR: Ninja
88-
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DREGEX_BACKEND=builtin -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
88+
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DUSE_SSH=libssh2 -DREGEX_BACKEND=builtin -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
8989
os: ubuntu-latest
9090
- # Xenial, GCC, mbedTLS
9191
container:
@@ -111,6 +111,14 @@ jobs:
111111
CMAKE_OPTIONS: -DUSE_HTTPS=mbedTLS -DUSE_SHA1=HTTPS -DREGEX_BACKEND=pcre -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
112112
CMAKE_GENERATOR: Ninja
113113
os: ubuntu-latest
114+
- # Xenial, GCC, OpenSSL, LibSSH
115+
container:
116+
name: xenial
117+
env:
118+
CC: gcc
119+
CMAKE_GENERATOR: Ninja
120+
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DUSE_SSH=libssh -DREGEX_BACKEND=builtin -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
121+
os: ubuntu-latest
114122
- # Focal, Clang 10, mbedTLS, MemorySanitizer
115123
container:
116124
name: focal

‎.github/workflows/nightly.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ jobs:
1919
strategy:
2020
matrix:
2121
platform:
22-
- # Xenial, GCC, OpenSSL
22+
- # Xenial, GCC, OpenSSL, LibSSH2
2323
container:
2424
name: xenial
2525
env:
2626
CC: gcc
2727
CMAKE_GENERATOR: Ninja
28-
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DREGEX_BACKEND=builtin -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
28+
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DUSE_SSH=libssh2 -DREGEX_BACKEND=builtin -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
2929
os: ubuntu-latest
3030
- # Xenial, GCC, mbedTLS
3131
container:
@@ -59,6 +59,14 @@ jobs:
5959
CMAKE_OPTIONS: -DTHREADSAFE=OFF -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
6060
CMAKE_GENERATOR: Ninja
6161
os: ubuntu-latest
62+
- # Xenial, GCC, OpenSSL, LibSSH
63+
container:
64+
name: xenial
65+
env:
66+
CC: gcc
67+
CMAKE_GENERATOR: Ninja
68+
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DUSE_SSH=libssh -DREGEX_BACKEND=builtin -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
69+
os: ubuntu-latest
6270
- # Focal, Clang 10, mbedTLS, MemorySanitizer
6371
container:
6472
name: focal

‎ci/docker/xenial

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ RUN apt-get update && \
2424
python \
2525
sudo \
2626
valgrind \
27+
xz-utils \
2728
&& \
2829
rm -rf /var/lib/apt/lists/*
2930

@@ -48,7 +49,19 @@ RUN cd /tmp && \
4849
cd .. && \
4950
rm -rf libssh2-1.8.2
5051

51-
FROM libssh2 AS valgrind
52+
FROM libssh2 AS libssh
53+
RUN cd /tmp && \
54+
curl --insecure --location --silent --show-error https://www.libssh.org/files/0.9/libssh-0.9.5.tar.xz | \
55+
tar -xJ && \
56+
cd libssh-0.9.5 && \
57+
mkdir build && \
58+
cd build && \
59+
CFLAGS=-fPIC cmake -G Ninja -DBUILD_SHARED_LIBS=ON -DWITH_GCRYPT=ON .. && \
60+
ninja install && \
61+
cd ../.. && \
62+
rm -rf libssh-0.9.5
63+
64+
FROM libssh AS valgrind
5265
RUN cd /tmp && \
5366
curl --insecure --location --silent --show-error https://sourceware.org/pub/valgrind/valgrind-3.15.0.tar.bz2 | \
5467
tar -xj && \

0 commit comments

Comments
 (0)
0