Skip to content

Commit ee3307a

Browse files
authored
Merge pull request libgit2#5392 from pks-t/pks/ci-warnings
azure: fix misleading messages printed to stderr being
2 parents 6a61a41 + 49bb423 commit ee3307a

File tree

4 files changed

+13
-16
lines changed

4 files changed

+13
-16
lines changed

azure-pipelines/docker/bionic

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@ RUN apt-get update && \
2525
RUN mkdir /var/run/sshd
2626

2727
RUN cd /tmp && \
28-
curl -LO https://tls.mbed.org/download/mbedtls-2.16.2-apache.tgz && \
29-
tar -xf mbedtls-2.16.2-apache.tgz && \
30-
rm -f mbedtls-2.16.2-apache.tgz && \
28+
curl --location --silent https://tls.mbed.org/download/mbedtls-2.16.2-apache.tgz | \
29+
tar -xz && \
3130
cd mbedtls-2.16.2 && \
3231
scripts/config.pl set MBEDTLS_MD4_C 1 && \
3332
CFLAGS=-fPIC cmake -G Ninja -DENABLE_PROGRAMS=OFF -DENABLE_TESTING=OFF -DUSE_SHARED_MBEDTLS_LIBRARY=OFF -DUSE_STATIC_MBEDTLS_LIBRARY=ON . && \
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
2-
useradd --shell /bin/bash --create-home libgit2
1+
#!/bin/bash -e
2+
useradd --shell /bin/bash libgit2
33
chown -R $(id -u libgit2) /home/libgit2
44
exec gosu libgit2 "$@"

azure-pipelines/docker/xenial

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@ RUN apt-get update && \
2727

2828
FROM apt AS mbedtls
2929
RUN cd /tmp && \
30-
curl -LO https://tls.mbed.org/download/mbedtls-2.16.2-apache.tgz && \
31-
tar -xf mbedtls-2.16.2-apache.tgz && \
32-
rm -f mbedtls-2.16.2-apache.tgz && \
30+
curl --location --silent https://tls.mbed.org/download/mbedtls-2.16.2-apache.tgz | \
31+
tar -xz && \
3332
cd mbedtls-2.16.2 && \
3433
scripts/config.pl set MBEDTLS_MD4_C 1 && \
3534
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 && \
3938

4039
FROM mbedtls AS libssh2
4140
RUN cd /tmp && \
42-
curl -LO https://www.libssh2.org/download/libssh2-1.8.2.tar.gz && \
43-
tar -xf libssh2-1.8.2.tar.gz && \
44-
rm -f libssh2-1.8.2.tar.gz && \
41+
curl --location --silent https://www.libssh2.org/download/libssh2-1.8.2.tar.gz | \
42+
tar -xz && \
4543
cd libssh2-1.8.2 && \
4644
CFLAGS=-fPIC cmake -G Ninja -DBUILD_SHARED_LIBS=ON -DCRYPTO_BACKEND=Libgcrypt . && \
4745
ninja install && \
@@ -50,9 +48,8 @@ RUN cd /tmp && \
5048

5149
FROM libssh2 AS valgrind
5250
RUN cd /tmp && \
53-
curl -LO https://sourceware.org/pub/valgrind/valgrind-3.15.0.tar.bz2 && \
54-
tar -xf valgrind-3.15.0.tar.bz2 && \
55-
rm -f valgrind-3.15.0.tar.bz2 && \
51+
curl --location --silent https://sourceware.org/pub/valgrind/valgrind-3.15.0.tar.bz2 | \
52+
tar -xj && \
5653
cd valgrind-3.15.0 && \
5754
./configure && \
5855
make && \

azure-pipelines/test.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,11 @@ if [ -z "$SKIP_GITDAEMON_TESTS" ]; then
8181
git init --bare "${GITDAEMON_DIR}/test.git"
8282
git daemon --listen=localhost --export-all --enable=receive-pack --base-path="${GITDAEMON_DIR}" "${GITDAEMON_DIR}" 2>/dev/null &
8383
GITDAEMON_PID=$!
84+
disown $GITDAEMON_PID
8485
fi
8586

8687
if [ -z "$SKIP_PROXY_TESTS" ]; then
87-
curl -L https://github.com/ethomson/poxyproxy/releases/download/v0.7.0/poxyproxy-0.7.0.jar >poxyproxy.jar
88+
curl --location --silent https://github.com/ethomson/poxyproxy/releases/download/v0.7.0/poxyproxy-0.7.0.jar >poxyproxy.jar
8889

8990
echo ""
9091
echo "Starting HTTP proxy (Basic)..."
@@ -96,7 +97,7 @@ if [ -z "$SKIP_PROXY_TESTS" ]; then
9697
fi
9798

9899
if [ -z "$SKIP_NTLM_TESTS" ]; then
99-
curl -L https://github.com/ethomson/poxygit/releases/download/v0.4.0/poxygit-0.4.0.jar >poxygit.jar
100+
curl --location --silent https://github.com/ethomson/poxygit/releases/download/v0.4.0/poxygit-0.4.0.jar >poxygit.jar
100101

101102
echo ""
102103
echo "Starting HTTP server..."

0 commit comments

Comments
 (0)