summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2021-09-21 12:27:37 -0400
committerGitHub <noreply@github.com>2021-09-21 12:27:37 -0400
commitabd8142c4afbe8ceca579305efd8f9f9958cd7ed (patch)
treee91d6d145d25ce841e6bc985b3c196836bead077
parent5ea2966d01624912538545b55061c725b189fef9 (diff)
parent825dd544ab719b1c6c3952cc292a20643392054d (diff)
downloadlibgit2-abd8142c4afbe8ceca579305efd8f9f9958cd7ed.tar.gz
Merge pull request #6064 from libgit2/ethomson/ci_libssh2
ci: pull libssh2 from www.libssh2.org
-rw-r--r--ci/docker/centos72
-rw-r--r--ci/docker/centos82
-rw-r--r--ci/docker/focal3
-rw-r--r--ci/docker/xenial3
4 files changed, 4 insertions, 6 deletions
diff --git a/ci/docker/centos7 b/ci/docker/centos7
index 098edb26a..8105f1442 100644
--- a/ci/docker/centos7
+++ b/ci/docker/centos7
@@ -18,7 +18,7 @@ RUN yum install -y \
FROM yum AS libssh2
RUN cd /tmp && \
- curl https://libssh2.org/download/libssh2-1.8.0.tar.gz | tar -xz && \
+ curl --location --silent --show-error https://www.libssh2.org/download/libssh2-1.8.0.tar.gz | tar -xz && \
cd libssh2-1.8.0 && \
./configure && \
make && \
diff --git a/ci/docker/centos8 b/ci/docker/centos8
index f47198446..cca088103 100644
--- a/ci/docker/centos8
+++ b/ci/docker/centos8
@@ -20,7 +20,7 @@ RUN yum install -y \
FROM yum AS libssh2
RUN cd /tmp && \
- curl https://libssh2.org/download/libssh2-1.8.0.tar.gz | tar -xz && \
+ curl --location --silent --show-error https://www.libssh2.org/download/libssh2-1.8.0.tar.gz | tar -xz && \
cd libssh2-1.8.0 && \
./configure && \
make && \
diff --git a/ci/docker/focal b/ci/docker/focal
index 171387698..37d7d6356 100644
--- a/ci/docker/focal
+++ b/ci/docker/focal
@@ -49,8 +49,7 @@ RUN cd /tmp && \
FROM mbedtls AS libssh2
RUN cd /tmp && \
- curl --insecure --location --silent --show-error https://www.libssh2.org/download/libssh2-1.9.0.tar.gz | \
- tar -xz && \
+ curl --location --silent --show-error https://www.libssh2.org/download/libssh2-1.9.0.tar.gz | tar -xz && \
cd libssh2-1.9.0 && \
mkdir build build-msan && \
cd build && \
diff --git a/ci/docker/xenial b/ci/docker/xenial
index 4c3810af4..c19fe421d 100644
--- a/ci/docker/xenial
+++ b/ci/docker/xenial
@@ -41,8 +41,7 @@ RUN cd /tmp && \
FROM mbedtls AS libssh2
RUN cd /tmp && \
- curl --insecure --location --silent --show-error https://www.libssh2.org/download/libssh2-1.8.2.tar.gz | \
- tar -xz && \
+ curl --location --silent --show-error https://www.libssh2.org/download/libssh2-1.8.2.tar.gz | tar -xz && \
cd libssh2-1.8.2 && \
CFLAGS=-fPIC cmake -G Ninja -DBUILD_SHARED_LIBS=ON -DCRYPTO_BACKEND=Libgcrypt . && \
ninja install && \