Skip to content

Commit c76c1e8

Browse files
committed
azure: docker: consistently silence curl but show errors
We currently pass the "--silent" flag to most invocations of curl, but in fact this does not only suppress the progress meter, but also any errors. So let's also pass "--show-error", too.
1 parent f2e43a8 commit c76c1e8

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

azure-pipelines/coverity.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ TOOL_DIR=${BUILD_DIR}/coverity-tools
2525
if ! test -d "$TOOL_DIR"
2626
then
2727
mkdir -p "$TOOL_DIR"
28-
curl --silent --location --data "project=libgit2&token=$COVERITY_TOKEN" "$SCAN_TOOL" |
28+
curl --silent --show-error --location --data "project=libgit2&token=$COVERITY_TOKEN" "$SCAN_TOOL" |
2929
tar -xzC "$TOOL_DIR"
3030
ln -s "$(find "$TOOL_DIR" -type d -name 'cov-analysis*')" "$TOOL_DIR"/cov-analysis
3131
fi
@@ -44,7 +44,7 @@ COVERITY_UNSUPPORTED=1 \
4444
tar -czf libgit2.tgz cov-int
4545
REVISION=$(cd ${SOURCE_DIR} && git rev-parse --short HEAD)
4646
HTML="$(curl \
47-
--silent \
47+
--silent --show-error \
4848
--write-out "\n%{http_code}" \
4949
--form token="$COVERITY_TOKEN" \
5050
--form email=libgit2@gmail.com \

azure-pipelines/docker/bionic

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ RUN apt-get update && \
2525

2626
FROM apt AS mbedtls
2727
RUN cd /tmp && \
28-
curl --location http://secure.globalsign.com/cacert/gsrsaovsslca2018.crt | openssl x509 -inform der -out /tmp/cacert.pem && \
29-
curl --location https://curl.haxx.se/ca/cacert.pem >> /tmp/cacert.pem && \
30-
curl --location --silent https://tls.mbed.org/download/mbedtls-2.16.2-apache.tgz --cacert /tmp/cacert.pem | \
28+
curl --location --silent --show-error http://secure.globalsign.com/cacert/gsrsaovsslca2018.crt | openssl x509 -inform der -out /tmp/cacert.pem && \
29+
curl --location --silent --show-error https://curl.haxx.se/ca/cacert.pem >> /tmp/cacert.pem && \
30+
curl --location --silent --show-error https://tls.mbed.org/download/mbedtls-2.16.2-apache.tgz --cacert /tmp/cacert.pem | \
3131
tar -xz && \
3232
cd mbedtls-2.16.2 && \
3333
scripts/config.pl set MBEDTLS_MD4_C 1 && \

azure-pipelines/docker/xenial

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ RUN apt-get update && \
2929

3030
FROM apt AS mbedtls
3131
RUN cd /tmp && \
32-
curl --location http://secure.globalsign.com/cacert/gsrsaovsslca2018.crt | openssl x509 -inform der -out /tmp/cacert.pem && \
33-
curl --location https://curl.haxx.se/ca/cacert.pem >> /tmp/cacert.pem && \
34-
curl --location --silent https://tls.mbed.org/download/mbedtls-2.16.2-apache.tgz --cacert /tmp/cacert.pem | \
32+
curl --location --silent --show-error http://secure.globalsign.com/cacert/gsrsaovsslca2018.crt | openssl x509 -inform der -out /tmp/cacert.pem && \
33+
curl --location --silent --show-error https://curl.haxx.se/ca/cacert.pem >> /tmp/cacert.pem && \
34+
curl --location --silent --show-error https://tls.mbed.org/download/mbedtls-2.16.2-apache.tgz --cacert /tmp/cacert.pem | \
3535
tar -xz && \
3636
cd mbedtls-2.16.2 && \
3737
scripts/config.pl set MBEDTLS_MD4_C 1 && \
@@ -42,7 +42,7 @@ RUN cd /tmp && \
4242

4343
FROM mbedtls AS libssh2
4444
RUN cd /tmp && \
45-
curl --location --silent https://www.libssh2.org/download/libssh2-1.8.2.tar.gz | \
45+
curl --location --silent --show-error https://www.libssh2.org/download/libssh2-1.8.2.tar.gz | \
4646
tar -xz && \
4747
cd libssh2-1.8.2 && \
4848
CFLAGS=-fPIC cmake -G Ninja -DBUILD_SHARED_LIBS=ON -DCRYPTO_BACKEND=Libgcrypt . && \
@@ -52,7 +52,7 @@ RUN cd /tmp && \
5252

5353
FROM libssh2 AS valgrind
5454
RUN cd /tmp && \
55-
curl --location --silent https://sourceware.org/pub/valgrind/valgrind-3.15.0.tar.bz2 | \
55+
curl --location --silent --show-error https://sourceware.org/pub/valgrind/valgrind-3.15.0.tar.bz2 | \
5656
tar -xj && \
5757
cd valgrind-3.15.0 && \
5858
./configure && \

azure-pipelines/test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ if [ -z "$SKIP_GITDAEMON_TESTS" ]; then
8585
fi
8686

8787
if [ -z "$SKIP_PROXY_TESTS" ]; then
88-
curl --location --silent https://github.com/ethomson/poxyproxy/releases/download/v0.7.0/poxyproxy-0.7.0.jar >poxyproxy.jar
88+
curl --location --silent --show-error https://github.com/ethomson/poxyproxy/releases/download/v0.7.0/poxyproxy-0.7.0.jar >poxyproxy.jar
8989

9090
echo ""
9191
echo "Starting HTTP proxy (Basic)..."
@@ -97,7 +97,7 @@ if [ -z "$SKIP_PROXY_TESTS" ]; then
9797
fi
9898

9999
if [ -z "$SKIP_NTLM_TESTS" ]; then
100-
curl --location --silent https://github.com/ethomson/poxygit/releases/download/v0.4.0/poxygit-0.4.0.jar >poxygit.jar
100+
curl --location --silent --show-error https://github.com/ethomson/poxygit/releases/download/v0.4.0/poxygit-0.4.0.jar >poxygit.jar
101101

102102
echo ""
103103
echo "Starting HTTP server..."

0 commit comments

Comments
 (0)