Skip to content

Commit 44372ce

Browse files
ethomsonethomson
authored
Merge pull request libgit2#5451 from pks-t/pks/docker-curl
azure: fix errors due to curl and removal of old VM images
2 parents be36db2 + 153199a commit 44372ce

File tree

10 files changed

+58
-51
lines changed

10 files changed

+58
-51
lines changed

‎azure-pipelines.yml‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
- job: linux_amd64_xenial_gcc_openssl
1010
displayName: 'Linux (amd64; Xenial; GCC; OpenSSL)'
1111
pool:
12-
vmImage: 'Ubuntu 16.04'
12+
vmImage: 'ubuntu-18.04'
1313
steps:
1414
- template: azure-pipelines/docker.yml
1515
parameters:
@@ -25,7 +25,7 @@ jobs:
2525
- job: linux_amd64_xenial_gcc_mbedtls
2626
displayName: 'Linux (amd64; Xenial; GCC; mbedTLS)'
2727
pool:
28-
vmImage: 'Ubuntu 16.04'
28+
vmImage: 'ubuntu-18.04'
2929
steps:
3030
- template: azure-pipelines/docker.yml
3131
parameters:
@@ -41,7 +41,7 @@ jobs:
4141
- job: linux_amd64_xenial_clang_openssl
4242
displayName: 'Linux (amd64; Xenial; Clang; OpenSSL)'
4343
pool:
44-
vmImage: 'Ubuntu 16.04'
44+
vmImage: 'ubuntu-18.04'
4545
steps:
4646
- template: azure-pipelines/docker.yml
4747
parameters:
@@ -57,7 +57,7 @@ jobs:
5757
- job: linux_amd64_xenial_clang_mbedtls
5858
displayName: 'Linux (amd64; Xenial; Clang; mbedTLS)'
5959
pool:
60-
vmImage: 'Ubuntu 16.04'
60+
vmImage: 'ubuntu-18.04'
6161
steps:
6262
- template: azure-pipelines/docker.yml
6363
parameters:
@@ -71,9 +71,9 @@ jobs:
7171
GITTEST_NEGOTIATE_PASSWORD=${{ variables.GITTEST_NEGOTIATE_PASSWORD }}
7272
7373
- job: macos
74-
displayName: 'macOS'
74+
displayName: 'macOS (amd64; 10.15)'
7575
pool:
76-
vmImage: 'macOS 10.13'
76+
vmImage: 'macOS-10.15'
7777
steps:
7878
- bash: . '$(Build.SourcesDirectory)/azure-pipelines/setup-osx.sh'
7979
displayName: Setup
@@ -89,31 +89,34 @@ jobs:
8989

9090
- job: windows_vs_amd64
9191
displayName: 'Windows (amd64; Visual Studio)'
92-
pool: Hosted
92+
pool:
93+
vmImage: 'vs2017-win2016'
9394
steps:
9495
- template: azure-pipelines/bash.yml
9596
parameters:
9697
environmentVariables:
97-
CMAKE_GENERATOR: Visual Studio 12 2013 Win64
98-
CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON
98+
CMAKE_GENERATOR: Visual Studio 15 2017
99+
CMAKE_OPTIONS: -A x64 -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON
99100
SKIP_SSH_TESTS: true
100101
SKIP_NEGOTIATE_TESTS: true
101102

102103
- job: windows_vs_x86
103104
displayName: 'Windows (x86; Visual Studio)'
104-
pool: Hosted
105+
pool:
106+
vmImage: 'vs2017-win2016'
105107
steps:
106108
- template: azure-pipelines/bash.yml
107109
parameters:
108110
environmentVariables:
109-
CMAKE_GENERATOR: Visual Studio 12 2013
110-
CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON -DUSE_SHA1=HTTPS
111+
CMAKE_GENERATOR: Visual Studio 15 2017
112+
CMAKE_OPTIONS: -A Win32 -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON -DUSE_SHA1=HTTPS
111113
SKIP_SSH_TESTS: true
112114
SKIP_NEGOTIATE_TESTS: true
113115

114116
- job: windows_mingw_amd64
115117
displayName: 'Windows (amd64; MinGW)'
116-
pool: Hosted
118+
pool:
119+
vmImage: 'vs2017-win2016'
117120
steps:
118121
- bash: . '$(Build.SourcesDirectory)\azure-pipelines\setup-mingw.sh'
119122
displayName: Setup
@@ -131,7 +134,8 @@ jobs:
131134

132135
- job: windows_mingw_x86
133136
displayName: 'Windows (x86; MinGW)'
134-
pool: Hosted
137+
pool:
138+
vmImage: 'vs2017-win2016'
135139
steps:
136140
- bash: . '$(Build.SourcesDirectory)\azure-pipelines\setup-mingw.sh'
137141
displayName: Setup
@@ -151,7 +155,7 @@ jobs:
151155
- job: documentation
152156
displayName: 'Generate Documentation'
153157
pool:
154-
vmImage: 'Ubuntu 16.04'
158+
vmImage: 'ubuntu-18.04'
155159
steps:
156160
- script: |
157161
cd $(Build.SourcesDirectory)/azure-pipelines/docker

‎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/coverity.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
- job: coverity
66
displayName: 'Coverity'
77
pool:
8-
vmImage: 'Ubuntu 16.04'
8+
vmImage: 'ubuntu-18.04'
99
steps:
1010
- script: |
1111
cd $(Build.SourcesDirectory)/azure-pipelines/docker

‎azure-pipelines/docker/bionic‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ 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 https://tls.mbed.org/download/mbedtls-2.16.2-apache.tgz | \
3129
tar -xz && \
3230
cd mbedtls-2.16.2 && \
3331
scripts/config.pl set MBEDTLS_MD4_C 1 && \

‎azure-pipelines/docker/docurium‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
FROM debian:jessie-slim
2-
ARG CACHEBUST=1
3-
RUN apt-get update
4-
RUN apt install -y cmake pkg-config ruby ruby-dev llvm libclang-3.5-dev libssl-dev python-pygments
5-
ARG CACHEBUST=1
1+
FROM ubuntu:bionic
2+
RUN apt update && apt install -y cmake pkg-config ruby ruby-dev llvm libclang-dev libssl-dev python-pygments
63
RUN gem install docurium

‎azure-pipelines/docker/xenial‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ 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 https://tls.mbed.org/download/mbedtls-2.16.2-apache.tgz | \
3533
tar -xz && \
3634
cd mbedtls-2.16.2 && \
3735
scripts/config.pl set MBEDTLS_MD4_C 1 && \
@@ -42,7 +40,7 @@ RUN cd /tmp && \
4240

4341
FROM mbedtls AS libssh2
4442
RUN cd /tmp && \
45-
curl --location --silent https://www.libssh2.org/download/libssh2-1.8.2.tar.gz | \
43+
curl --insecure --location --silent --show-error https://www.libssh2.org/download/libssh2-1.8.2.tar.gz | \
4644
tar -xz && \
4745
cd libssh2-1.8.2 && \
4846
CFLAGS=-fPIC cmake -G Ninja -DBUILD_SHARED_LIBS=ON -DCRYPTO_BACKEND=Libgcrypt . && \
@@ -52,7 +50,7 @@ RUN cd /tmp && \
5250

5351
FROM libssh2 AS valgrind
5452
RUN cd /tmp && \
55-
curl --location --silent https://sourceware.org/pub/valgrind/valgrind-3.15.0.tar.bz2 | \
53+
curl --insecure --location --silent --show-error https://sourceware.org/pub/valgrind/valgrind-3.15.0.tar.bz2 | \
5654
tar -xj && \
5755
cd valgrind-3.15.0 && \
5856
./configure && \

‎azure-pipelines/nightly.yml‎

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
- job: linux_amd64_xenial_gcc_openssl
66
displayName: 'Linux (amd64; Xenial; GCC; OpenSSL)'
77
pool:
8-
vmImage: 'Ubuntu 16.04'
8+
vmImage: 'ubuntu-18.04'
99
steps:
1010
- template: docker.yml
1111
parameters:
@@ -21,7 +21,7 @@ jobs:
2121
- job: linux_amd64_xenial_gcc_mbedtls
2222
displayName: 'Linux (amd64; Xenial; GCC; mbedTLS)'
2323
pool:
24-
vmImage: 'Ubuntu 16.04'
24+
vmImage: 'ubuntu-18.04'
2525
steps:
2626
- template: docker.yml
2727
parameters:
@@ -37,7 +37,7 @@ jobs:
3737
- job: linux_amd64_xenial_clang_openssl
3838
displayName: 'Linux (amd64; Xenial; Clang; OpenSSL)'
3939
pool:
40-
vmImage: 'Ubuntu 16.04'
40+
vmImage: 'ubuntu-18.04'
4141
steps:
4242
- template: docker.yml
4343
parameters:
@@ -53,7 +53,7 @@ jobs:
5353
- job: linux_amd64_xenial_clang_mbedtls
5454
displayName: 'Linux (amd64; Xenial; Clang; mbedTLS)'
5555
pool:
56-
vmImage: 'Ubuntu 16.04'
56+
vmImage: 'ubuntu-18.04'
5757
steps:
5858
- template: docker.yml
5959
parameters:
@@ -67,9 +67,9 @@ jobs:
6767
RUN_INVASIVE_TESTS=true
6868
6969
- job: macos
70-
displayName: 'macOS'
70+
displayName: 'macOS (amd64; 10.15)'
7171
pool:
72-
vmImage: 'macOS 10.13'
72+
vmImage: 'macOS-10.15'
7373
steps:
7474
- bash: . '$(Build.SourcesDirectory)/azure-pipelines/setup-osx.sh'
7575
displayName: Setup
@@ -85,31 +85,34 @@ jobs:
8585

8686
- job: windows_vs_amd64
8787
displayName: 'Windows (amd64; Visual Studio)'
88-
pool: Hosted
88+
pool:
89+
vmImage: 'vs2017-win2016'
8990
steps:
9091
- template: bash.yml
9192
parameters:
9293
environmentVariables:
93-
CMAKE_GENERATOR: Visual Studio 12 2013 Win64
94-
CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON
94+
CMAKE_GENERATOR: Visual Studio 15 2017
95+
CMAKE_OPTIONS: -A x64 -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON
9596
RUN_INVASIVE_TESTS: true
9697
SKIP_SSH_TESTS: true
9798

9899
- job: windows_vs_x86
99100
displayName: 'Windows (x86; Visual Studio)'
100-
pool: Hosted
101+
pool:
102+
vmImage: 'vs2017-win2016'
101103
steps:
102104
- template: bash.yml
103105
parameters:
104106
environmentVariables:
105-
CMAKE_GENERATOR: Visual Studio 12 2013
106-
CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON -DUSE_SHA1=HTTPS
107+
CMAKE_GENERATOR: Visual Studio 15 2017
108+
CMAKE_OPTIONS: -A Win32 -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON -DUSE_SHA1=HTTPS
107109
RUN_INVASIVE_TESTS: true
108110
SKIP_SSH_TESTS: true
109111

110112
- job: windows_mingw_amd64
111113
displayName: 'Windows (amd64; MinGW)'
112-
pool: Hosted
114+
pool:
115+
vmImage: 'vs2017-win2016'
113116
steps:
114117
- bash: . '$(Build.SourcesDirectory)\azure-pipelines\setup-mingw.sh'
115118
displayName: Setup
@@ -127,7 +130,8 @@ jobs:
127130

128131
- job: windows_mingw_x86
129132
displayName: 'Windows (x86; MinGW)'
130-
pool: Hosted
133+
pool:
134+
vmImage: 'vs2017-win2016'
131135
steps:
132136
- bash: . '$(Build.SourcesDirectory)\azure-pipelines\setup-mingw.sh'
133137
displayName: Setup
@@ -147,7 +151,7 @@ jobs:
147151
- job: linux_x86_bionic_gcc_openssl
148152
displayName: 'Linux (x86; Bionic; GCC; OpenSSL)'
149153
pool:
150-
vmImage: 'Ubuntu 16.04'
154+
vmImage: 'ubuntu-18.04'
151155
steps:
152156
- template: docker.yml
153157
parameters:
@@ -164,7 +168,7 @@ jobs:
164168
- job: linux_x86_bionic_clang_openssl
165169
displayName: 'Linux (x86; Bionic; Clang; OpenSSL)'
166170
pool:
167-
vmImage: 'Ubuntu 16.04'
171+
vmImage: 'ubuntu-18.04'
168172
steps:
169173
- template: docker.yml
170174
parameters:
@@ -181,7 +185,7 @@ jobs:
181185
- job: linux_arm32_bionic_gcc_openssl
182186
displayName: 'Linux (arm32; Bionic; GCC; OpenSSL)'
183187
pool:
184-
vmImage: 'Ubuntu 16.04'
188+
vmImage: 'ubuntu-18.04'
185189
steps:
186190
- template: docker.yml
187191
parameters:
@@ -199,7 +203,7 @@ jobs:
199203
- job: linux_arm64_bionic_gcc_openssl
200204
displayName: 'Linux (arm64; Bionic; GCC; OpenSSL)'
201205
pool:
202-
vmImage: 'Ubuntu 16.04'
206+
vmImage: 'ubuntu-18.04'
203207
steps:
204208
- template: docker.yml
205209
parameters:

‎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..."

‎deps/ntlmclient/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ DISABLE_WARNINGS(implicit-fallthrough)
77
IF (HTTPS_BACKEND STREQUAL "SecureTransport")
88
ADD_DEFINITIONS(-DCRYPT_COMMONCRYPTO)
99
SET(SRC_NTLMCLIENT_CRYPTO "crypt_commoncrypto.c")
10+
# CC_MD4 has been deprecated in macOS 10.15.
11+
SET_SOURCE_FILES_PROPERTIES("crypt_commoncrypto.c" COMPILE_FLAGS "-Wno-deprecated")
1012
ELSEIF (HTTPS_BACKEND STREQUAL "OpenSSL")
1113
ADD_DEFINITIONS(-DCRYPT_OPENSSL)
1214
INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})

‎src/CMakeLists.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,10 @@ FILE(GLOB SRC_GIT2 *.c *.h
300300
streams/*.c streams/*.h
301301
transports/*.c transports/*.h
302302
xdiff/*.c xdiff/*.h)
303+
IF(APPLE)
304+
# The old Secure Transport API has been deprecated in macOS 10.15.
305+
SET_SOURCE_FILES_PROPERTIES(streams/stransport.c PROPERTIES COMPILE_FLAGS -Wno-deprecated)
306+
ENDIF()
303307

304308
# the xdiff dependency is not (yet) warning-free, disable warnings as
305309
# errors for the xdiff sources until we've sorted them out

0 commit comments

Comments
 (0)