diff options
author | Edward Thomson <ethomson@edwardthomson.com> | 2020-02-08 17:34:53 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-08 17:34:53 +0000 |
commit | ee3307a183e39d602b25fa94831c6fc09e7c1b61 (patch) | |
tree | 3fe5a44163dff41e863f900efd81bec22f5b7b53 | |
parent | 6a61a418c05a1835cefebe611bf31f12a6ce76bf (diff) | |
parent | 49bb4237cbe5af6c2ca5f155db3551ff9eb75e2e (diff) | |
download | libgit2-ee3307a183e39d602b25fa94831c6fc09e7c1b61.tar.gz |
Merge pull request #5392 from pks-t/pks/ci-warnings
azure: fix misleading messages printed to stderr being
-rw-r--r-- | azure-pipelines/docker/bionic | 5 | ||||
-rw-r--r-- | azure-pipelines/docker/entrypoint.sh | 4 | ||||
-rw-r--r-- | azure-pipelines/docker/xenial | 15 | ||||
-rwxr-xr-x | azure-pipelines/test.sh | 5 |
4 files changed, 13 insertions, 16 deletions
diff --git a/azure-pipelines/docker/bionic b/azure-pipelines/docker/bionic index 83d96abf3..648bda704 100644 --- a/azure-pipelines/docker/bionic +++ b/azure-pipelines/docker/bionic @@ -25,9 +25,8 @@ RUN apt-get update && \ RUN mkdir /var/run/sshd RUN cd /tmp && \ - curl -LO https://tls.mbed.org/download/mbedtls-2.16.2-apache.tgz && \ - tar -xf mbedtls-2.16.2-apache.tgz && \ - rm -f mbedtls-2.16.2-apache.tgz && \ + curl --location --silent https://tls.mbed.org/download/mbedtls-2.16.2-apache.tgz | \ + tar -xz && \ cd mbedtls-2.16.2 && \ scripts/config.pl set MBEDTLS_MD4_C 1 && \ CFLAGS=-fPIC cmake -G Ninja -DENABLE_PROGRAMS=OFF -DENABLE_TESTING=OFF -DUSE_SHARED_MBEDTLS_LIBRARY=OFF -DUSE_STATIC_MBEDTLS_LIBRARY=ON . && \ diff --git a/azure-pipelines/docker/entrypoint.sh b/azure-pipelines/docker/entrypoint.sh index 2118a2b5d..38eedf02b 100644 --- a/azure-pipelines/docker/entrypoint.sh +++ b/azure-pipelines/docker/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/bash -useradd --shell /bin/bash --create-home libgit2 +#!/bin/bash -e +useradd --shell /bin/bash libgit2 chown -R $(id -u libgit2) /home/libgit2 exec gosu libgit2 "$@" diff --git a/azure-pipelines/docker/xenial b/azure-pipelines/docker/xenial index 6e3a469ca..cb5d4919a 100644 --- a/azure-pipelines/docker/xenial +++ b/azure-pipelines/docker/xenial @@ -27,9 +27,8 @@ RUN apt-get update && \ FROM apt AS mbedtls RUN cd /tmp && \ - curl -LO https://tls.mbed.org/download/mbedtls-2.16.2-apache.tgz && \ - tar -xf mbedtls-2.16.2-apache.tgz && \ - rm -f mbedtls-2.16.2-apache.tgz && \ + curl --location --silent https://tls.mbed.org/download/mbedtls-2.16.2-apache.tgz | \ + tar -xz && \ cd mbedtls-2.16.2 && \ scripts/config.pl set MBEDTLS_MD4_C 1 && \ CFLAGS=-fPIC cmake -G Ninja -DENABLE_PROGRAMS=OFF -DENABLE_TESTING=OFF -DUSE_SHARED_MBEDTLS_LIBRARY=OFF -DUSE_STATIC_MBEDTLS_LIBRARY=ON . && \ @@ -39,9 +38,8 @@ RUN cd /tmp && \ FROM mbedtls AS libssh2 RUN cd /tmp && \ - curl -LO https://www.libssh2.org/download/libssh2-1.8.2.tar.gz && \ - tar -xf libssh2-1.8.2.tar.gz && \ - rm -f libssh2-1.8.2.tar.gz && \ + curl --location --silent 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 && \ @@ -50,9 +48,8 @@ RUN cd /tmp && \ FROM libssh2 AS valgrind RUN cd /tmp && \ - curl -LO https://sourceware.org/pub/valgrind/valgrind-3.15.0.tar.bz2 && \ - tar -xf valgrind-3.15.0.tar.bz2 && \ - rm -f valgrind-3.15.0.tar.bz2 && \ + curl --location --silent https://sourceware.org/pub/valgrind/valgrind-3.15.0.tar.bz2 | \ + tar -xj && \ cd valgrind-3.15.0 && \ ./configure && \ make && \ diff --git a/azure-pipelines/test.sh b/azure-pipelines/test.sh index dfd9960ec..96832d64c 100755 --- a/azure-pipelines/test.sh +++ b/azure-pipelines/test.sh @@ -81,10 +81,11 @@ if [ -z "$SKIP_GITDAEMON_TESTS" ]; then git init --bare "${GITDAEMON_DIR}/test.git" git daemon --listen=localhost --export-all --enable=receive-pack --base-path="${GITDAEMON_DIR}" "${GITDAEMON_DIR}" 2>/dev/null & GITDAEMON_PID=$! + disown $GITDAEMON_PID fi if [ -z "$SKIP_PROXY_TESTS" ]; then - curl -L https://github.com/ethomson/poxyproxy/releases/download/v0.7.0/poxyproxy-0.7.0.jar >poxyproxy.jar + curl --location --silent https://github.com/ethomson/poxyproxy/releases/download/v0.7.0/poxyproxy-0.7.0.jar >poxyproxy.jar echo "" echo "Starting HTTP proxy (Basic)..." @@ -96,7 +97,7 @@ if [ -z "$SKIP_PROXY_TESTS" ]; then fi if [ -z "$SKIP_NTLM_TESTS" ]; then - curl -L https://github.com/ethomson/poxygit/releases/download/v0.4.0/poxygit-0.4.0.jar >poxygit.jar + curl --location --silent https://github.com/ethomson/poxygit/releases/download/v0.4.0/poxygit-0.4.0.jar >poxygit.jar echo "" echo "Starting HTTP server..." |