summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2020-01-14 22:25:55 +0100
committerDaniel Stenberg <daniel@haxx.se>2020-01-14 22:27:30 +0100
commit088fdf750090a606bc39f05a89836a7494954e53 (patch)
treebc2aaacee200af02887df4107d19f2407b30861e
parentbe578eea7e4d97a3c74fc7e1341ee258925e08ff (diff)
downloadcurl-bagder/wolfssh-build/ci.tar.gz
travis: add a build using wolfSSHbagder/wolfssh-build/ci
-rw-r--r--.travis.yml3
-rwxr-xr-xscripts/travis/before_script.sh15
2 files changed, 16 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index eacb36493..a84994885 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ cache:
- $HOME/wolfssl-4.0.0-stable
- $HOME/mesalink-1.0.0
- $HOME/nghttp2-1.39.2
+ - $HOME/wolfssh-1.4.3-stable
env:
global:
@@ -132,7 +133,7 @@ matrix:
compiler: gcc
dist: xenial
env:
- - T=debug-wolfssl C="--with-wolfssl --without-ssl"
+ - T=debug-wolfssl C="--with-wolfssl --without-ssl --with-wolfssh"
- OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
addons:
apt:
diff --git a/scripts/travis/before_script.sh b/scripts/travis/before_script.sh
index 60b63ece3..a9124a735 100755
--- a/scripts/travis/before_script.sh
+++ b/scripts/travis/before_script.sh
@@ -70,7 +70,7 @@ if [ $TRAVIS_OS_NAME = linux ]; then
tar -xzf v4.0.0-stable.tar.gz
cd wolfssl-4.0.0-stable
./autogen.sh
- ./configure --enable-tls13 --enable-all
+ ./configure --enable-tls13 --enable-all --enable-ssh
touch wolfssl/wolfcrypt/fips.h
make
fi
@@ -78,6 +78,19 @@ if [ $TRAVIS_OS_NAME = linux ]; then
cd $HOME/wolfssl-4.0.0-stable
sudo make install
+ if [ ! -e $HOME/wolfssh-1.4.3-stable/Makefile ]; then
+ cd $HOME
+ curl -LO https://github.com/wolfSSL/wolfssh/archive/v1.4.3-stable.tar.gz
+ tar -xzf v1.4.3-stable.tar.gz
+ cd wolfssh-1.4.3-stable
+ ./autogen.sh
+ ./configure --enable-sftp --disable-examples
+ make
+ fi
+
+ cd $HOME/wolfssh-1.4.3-stable
+ sudo make install
+
if [ ! -e $HOME/mesalink-1.0.0/Makefile ]; then
cd $HOME
curl https://sh.rustup.rs -sSf | sh -s -- -y