Unverified Commit 44372ce5 by Edward Thomson Committed by GitHub

Merge pull request #5451 from pks-t/pks/docker-curl

azure: fix errors due to curl and removal of old VM images
parents be36db28 153199ae
...@@ -9,7 +9,7 @@ jobs: ...@@ -9,7 +9,7 @@ jobs:
- job: linux_amd64_xenial_gcc_openssl - job: linux_amd64_xenial_gcc_openssl
displayName: 'Linux (amd64; Xenial; GCC; OpenSSL)' displayName: 'Linux (amd64; Xenial; GCC; OpenSSL)'
pool: pool:
vmImage: 'Ubuntu 16.04' vmImage: 'ubuntu-18.04'
steps: steps:
- template: azure-pipelines/docker.yml - template: azure-pipelines/docker.yml
parameters: parameters:
...@@ -25,7 +25,7 @@ jobs: ...@@ -25,7 +25,7 @@ jobs:
- job: linux_amd64_xenial_gcc_mbedtls - job: linux_amd64_xenial_gcc_mbedtls
displayName: 'Linux (amd64; Xenial; GCC; mbedTLS)' displayName: 'Linux (amd64; Xenial; GCC; mbedTLS)'
pool: pool:
vmImage: 'Ubuntu 16.04' vmImage: 'ubuntu-18.04'
steps: steps:
- template: azure-pipelines/docker.yml - template: azure-pipelines/docker.yml
parameters: parameters:
...@@ -41,7 +41,7 @@ jobs: ...@@ -41,7 +41,7 @@ jobs:
- job: linux_amd64_xenial_clang_openssl - job: linux_amd64_xenial_clang_openssl
displayName: 'Linux (amd64; Xenial; Clang; OpenSSL)' displayName: 'Linux (amd64; Xenial; Clang; OpenSSL)'
pool: pool:
vmImage: 'Ubuntu 16.04' vmImage: 'ubuntu-18.04'
steps: steps:
- template: azure-pipelines/docker.yml - template: azure-pipelines/docker.yml
parameters: parameters:
...@@ -57,7 +57,7 @@ jobs: ...@@ -57,7 +57,7 @@ jobs:
- job: linux_amd64_xenial_clang_mbedtls - job: linux_amd64_xenial_clang_mbedtls
displayName: 'Linux (amd64; Xenial; Clang; mbedTLS)' displayName: 'Linux (amd64; Xenial; Clang; mbedTLS)'
pool: pool:
vmImage: 'Ubuntu 16.04' vmImage: 'ubuntu-18.04'
steps: steps:
- template: azure-pipelines/docker.yml - template: azure-pipelines/docker.yml
parameters: parameters:
...@@ -71,9 +71,9 @@ jobs: ...@@ -71,9 +71,9 @@ jobs:
GITTEST_NEGOTIATE_PASSWORD=${{ variables.GITTEST_NEGOTIATE_PASSWORD }} GITTEST_NEGOTIATE_PASSWORD=${{ variables.GITTEST_NEGOTIATE_PASSWORD }}
- job: macos - job: macos
displayName: 'macOS' displayName: 'macOS (amd64; 10.15)'
pool: pool:
vmImage: 'macOS 10.13' vmImage: 'macOS-10.15'
steps: steps:
- bash: . '$(Build.SourcesDirectory)/azure-pipelines/setup-osx.sh' - bash: . '$(Build.SourcesDirectory)/azure-pipelines/setup-osx.sh'
displayName: Setup displayName: Setup
...@@ -89,31 +89,34 @@ jobs: ...@@ -89,31 +89,34 @@ jobs:
- job: windows_vs_amd64 - job: windows_vs_amd64
displayName: 'Windows (amd64; Visual Studio)' displayName: 'Windows (amd64; Visual Studio)'
pool: Hosted pool:
vmImage: 'vs2017-win2016'
steps: steps:
- template: azure-pipelines/bash.yml - template: azure-pipelines/bash.yml
parameters: parameters:
environmentVariables: environmentVariables:
CMAKE_GENERATOR: Visual Studio 12 2013 Win64 CMAKE_GENERATOR: Visual Studio 15 2017
CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON CMAKE_OPTIONS: -A x64 -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON
SKIP_SSH_TESTS: true SKIP_SSH_TESTS: true
SKIP_NEGOTIATE_TESTS: true SKIP_NEGOTIATE_TESTS: true
- job: windows_vs_x86 - job: windows_vs_x86
displayName: 'Windows (x86; Visual Studio)' displayName: 'Windows (x86; Visual Studio)'
pool: Hosted pool:
vmImage: 'vs2017-win2016'
steps: steps:
- template: azure-pipelines/bash.yml - template: azure-pipelines/bash.yml
parameters: parameters:
environmentVariables: environmentVariables:
CMAKE_GENERATOR: Visual Studio 12 2013 CMAKE_GENERATOR: Visual Studio 15 2017
CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON -DUSE_SHA1=HTTPS CMAKE_OPTIONS: -A Win32 -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON -DUSE_SHA1=HTTPS
SKIP_SSH_TESTS: true SKIP_SSH_TESTS: true
SKIP_NEGOTIATE_TESTS: true SKIP_NEGOTIATE_TESTS: true
- job: windows_mingw_amd64 - job: windows_mingw_amd64
displayName: 'Windows (amd64; MinGW)' displayName: 'Windows (amd64; MinGW)'
pool: Hosted pool:
vmImage: 'vs2017-win2016'
steps: steps:
- bash: . '$(Build.SourcesDirectory)\azure-pipelines\setup-mingw.sh' - bash: . '$(Build.SourcesDirectory)\azure-pipelines\setup-mingw.sh'
displayName: Setup displayName: Setup
...@@ -131,7 +134,8 @@ jobs: ...@@ -131,7 +134,8 @@ jobs:
- job: windows_mingw_x86 - job: windows_mingw_x86
displayName: 'Windows (x86; MinGW)' displayName: 'Windows (x86; MinGW)'
pool: Hosted pool:
vmImage: 'vs2017-win2016'
steps: steps:
- bash: . '$(Build.SourcesDirectory)\azure-pipelines\setup-mingw.sh' - bash: . '$(Build.SourcesDirectory)\azure-pipelines\setup-mingw.sh'
displayName: Setup displayName: Setup
...@@ -151,7 +155,7 @@ jobs: ...@@ -151,7 +155,7 @@ jobs:
- job: documentation - job: documentation
displayName: 'Generate Documentation' displayName: 'Generate Documentation'
pool: pool:
vmImage: 'Ubuntu 16.04' vmImage: 'ubuntu-18.04'
steps: steps:
- script: | - script: |
cd $(Build.SourcesDirectory)/azure-pipelines/docker cd $(Build.SourcesDirectory)/azure-pipelines/docker
......
...@@ -25,7 +25,7 @@ TOOL_DIR=${BUILD_DIR}/coverity-tools ...@@ -25,7 +25,7 @@ TOOL_DIR=${BUILD_DIR}/coverity-tools
if ! test -d "$TOOL_DIR" if ! test -d "$TOOL_DIR"
then then
mkdir -p "$TOOL_DIR" mkdir -p "$TOOL_DIR"
curl --silent --location --data "project=libgit2&token=$COVERITY_TOKEN" "$SCAN_TOOL" | curl --silent --show-error --location --data "project=libgit2&token=$COVERITY_TOKEN" "$SCAN_TOOL" |
tar -xzC "$TOOL_DIR" tar -xzC "$TOOL_DIR"
ln -s "$(find "$TOOL_DIR" -type d -name 'cov-analysis*')" "$TOOL_DIR"/cov-analysis ln -s "$(find "$TOOL_DIR" -type d -name 'cov-analysis*')" "$TOOL_DIR"/cov-analysis
fi fi
...@@ -44,7 +44,7 @@ COVERITY_UNSUPPORTED=1 \ ...@@ -44,7 +44,7 @@ COVERITY_UNSUPPORTED=1 \
tar -czf libgit2.tgz cov-int tar -czf libgit2.tgz cov-int
REVISION=$(cd ${SOURCE_DIR} && git rev-parse --short HEAD) REVISION=$(cd ${SOURCE_DIR} && git rev-parse --short HEAD)
HTML="$(curl \ HTML="$(curl \
--silent \ --silent --show-error \
--write-out "\n%{http_code}" \ --write-out "\n%{http_code}" \
--form token="$COVERITY_TOKEN" \ --form token="$COVERITY_TOKEN" \
--form email=libgit2@gmail.com \ --form email=libgit2@gmail.com \
......
...@@ -5,7 +5,7 @@ jobs: ...@@ -5,7 +5,7 @@ jobs:
- job: coverity - job: coverity
displayName: 'Coverity' displayName: 'Coverity'
pool: pool:
vmImage: 'Ubuntu 16.04' vmImage: 'ubuntu-18.04'
steps: steps:
- script: | - script: |
cd $(Build.SourcesDirectory)/azure-pipelines/docker cd $(Build.SourcesDirectory)/azure-pipelines/docker
......
...@@ -25,9 +25,7 @@ RUN apt-get update && \ ...@@ -25,9 +25,7 @@ RUN apt-get update && \
FROM apt AS mbedtls FROM apt AS mbedtls
RUN cd /tmp && \ RUN cd /tmp && \
curl --location http://secure.globalsign.com/cacert/gsrsaovsslca2018.crt | openssl x509 -inform der -out /tmp/cacert.pem && \ curl --location --silent --show-error https://tls.mbed.org/download/mbedtls-2.16.2-apache.tgz | \
curl --location https://curl.haxx.se/ca/cacert.pem >> /tmp/cacert.pem && \
curl --location --silent https://tls.mbed.org/download/mbedtls-2.16.2-apache.tgz --cacert /tmp/cacert.pem | \
tar -xz && \ tar -xz && \
cd mbedtls-2.16.2 && \ cd mbedtls-2.16.2 && \
scripts/config.pl set MBEDTLS_MD4_C 1 && \ scripts/config.pl set MBEDTLS_MD4_C 1 && \
......
FROM debian:jessie-slim FROM ubuntu:bionic
ARG CACHEBUST=1 RUN apt update && apt install -y cmake pkg-config ruby ruby-dev llvm libclang-dev libssl-dev python-pygments
RUN apt-get update
RUN apt install -y cmake pkg-config ruby ruby-dev llvm libclang-3.5-dev libssl-dev python-pygments
ARG CACHEBUST=1
RUN gem install docurium RUN gem install docurium
...@@ -29,9 +29,7 @@ RUN apt-get update && \ ...@@ -29,9 +29,7 @@ RUN apt-get update && \
FROM apt AS mbedtls FROM apt AS mbedtls
RUN cd /tmp && \ RUN cd /tmp && \
curl --location http://secure.globalsign.com/cacert/gsrsaovsslca2018.crt | openssl x509 -inform der -out /tmp/cacert.pem && \ curl --location --silent --show-error https://tls.mbed.org/download/mbedtls-2.16.2-apache.tgz | \
curl --location https://curl.haxx.se/ca/cacert.pem >> /tmp/cacert.pem && \
curl --location --silent https://tls.mbed.org/download/mbedtls-2.16.2-apache.tgz --cacert /tmp/cacert.pem | \
tar -xz && \ tar -xz && \
cd mbedtls-2.16.2 && \ cd mbedtls-2.16.2 && \
scripts/config.pl set MBEDTLS_MD4_C 1 && \ scripts/config.pl set MBEDTLS_MD4_C 1 && \
...@@ -42,7 +40,7 @@ RUN cd /tmp && \ ...@@ -42,7 +40,7 @@ RUN cd /tmp && \
FROM mbedtls AS libssh2 FROM mbedtls AS libssh2
RUN cd /tmp && \ RUN cd /tmp && \
curl --location --silent https://www.libssh2.org/download/libssh2-1.8.2.tar.gz | \ curl --insecure --location --silent --show-error https://www.libssh2.org/download/libssh2-1.8.2.tar.gz | \
tar -xz && \ tar -xz && \
cd libssh2-1.8.2 && \ cd libssh2-1.8.2 && \
CFLAGS=-fPIC cmake -G Ninja -DBUILD_SHARED_LIBS=ON -DCRYPTO_BACKEND=Libgcrypt . && \ CFLAGS=-fPIC cmake -G Ninja -DBUILD_SHARED_LIBS=ON -DCRYPTO_BACKEND=Libgcrypt . && \
...@@ -52,7 +50,7 @@ RUN cd /tmp && \ ...@@ -52,7 +50,7 @@ RUN cd /tmp && \
FROM libssh2 AS valgrind FROM libssh2 AS valgrind
RUN cd /tmp && \ RUN cd /tmp && \
curl --location --silent https://sourceware.org/pub/valgrind/valgrind-3.15.0.tar.bz2 | \ curl --insecure --location --silent --show-error https://sourceware.org/pub/valgrind/valgrind-3.15.0.tar.bz2 | \
tar -xj && \ tar -xj && \
cd valgrind-3.15.0 && \ cd valgrind-3.15.0 && \
./configure && \ ./configure && \
......
...@@ -5,7 +5,7 @@ jobs: ...@@ -5,7 +5,7 @@ jobs:
- job: linux_amd64_xenial_gcc_openssl - job: linux_amd64_xenial_gcc_openssl
displayName: 'Linux (amd64; Xenial; GCC; OpenSSL)' displayName: 'Linux (amd64; Xenial; GCC; OpenSSL)'
pool: pool:
vmImage: 'Ubuntu 16.04' vmImage: 'ubuntu-18.04'
steps: steps:
- template: docker.yml - template: docker.yml
parameters: parameters:
...@@ -21,7 +21,7 @@ jobs: ...@@ -21,7 +21,7 @@ jobs:
- job: linux_amd64_xenial_gcc_mbedtls - job: linux_amd64_xenial_gcc_mbedtls
displayName: 'Linux (amd64; Xenial; GCC; mbedTLS)' displayName: 'Linux (amd64; Xenial; GCC; mbedTLS)'
pool: pool:
vmImage: 'Ubuntu 16.04' vmImage: 'ubuntu-18.04'
steps: steps:
- template: docker.yml - template: docker.yml
parameters: parameters:
...@@ -37,7 +37,7 @@ jobs: ...@@ -37,7 +37,7 @@ jobs:
- job: linux_amd64_xenial_clang_openssl - job: linux_amd64_xenial_clang_openssl
displayName: 'Linux (amd64; Xenial; Clang; OpenSSL)' displayName: 'Linux (amd64; Xenial; Clang; OpenSSL)'
pool: pool:
vmImage: 'Ubuntu 16.04' vmImage: 'ubuntu-18.04'
steps: steps:
- template: docker.yml - template: docker.yml
parameters: parameters:
...@@ -53,7 +53,7 @@ jobs: ...@@ -53,7 +53,7 @@ jobs:
- job: linux_amd64_xenial_clang_mbedtls - job: linux_amd64_xenial_clang_mbedtls
displayName: 'Linux (amd64; Xenial; Clang; mbedTLS)' displayName: 'Linux (amd64; Xenial; Clang; mbedTLS)'
pool: pool:
vmImage: 'Ubuntu 16.04' vmImage: 'ubuntu-18.04'
steps: steps:
- template: docker.yml - template: docker.yml
parameters: parameters:
...@@ -67,9 +67,9 @@ jobs: ...@@ -67,9 +67,9 @@ jobs:
RUN_INVASIVE_TESTS=true RUN_INVASIVE_TESTS=true
- job: macos - job: macos
displayName: 'macOS' displayName: 'macOS (amd64; 10.15)'
pool: pool:
vmImage: 'macOS 10.13' vmImage: 'macOS-10.15'
steps: steps:
- bash: . '$(Build.SourcesDirectory)/azure-pipelines/setup-osx.sh' - bash: . '$(Build.SourcesDirectory)/azure-pipelines/setup-osx.sh'
displayName: Setup displayName: Setup
...@@ -85,31 +85,34 @@ jobs: ...@@ -85,31 +85,34 @@ jobs:
- job: windows_vs_amd64 - job: windows_vs_amd64
displayName: 'Windows (amd64; Visual Studio)' displayName: 'Windows (amd64; Visual Studio)'
pool: Hosted pool:
vmImage: 'vs2017-win2016'
steps: steps:
- template: bash.yml - template: bash.yml
parameters: parameters:
environmentVariables: environmentVariables:
CMAKE_GENERATOR: Visual Studio 12 2013 Win64 CMAKE_GENERATOR: Visual Studio 15 2017
CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON CMAKE_OPTIONS: -A x64 -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON
RUN_INVASIVE_TESTS: true RUN_INVASIVE_TESTS: true
SKIP_SSH_TESTS: true SKIP_SSH_TESTS: true
- job: windows_vs_x86 - job: windows_vs_x86
displayName: 'Windows (x86; Visual Studio)' displayName: 'Windows (x86; Visual Studio)'
pool: Hosted pool:
vmImage: 'vs2017-win2016'
steps: steps:
- template: bash.yml - template: bash.yml
parameters: parameters:
environmentVariables: environmentVariables:
CMAKE_GENERATOR: Visual Studio 12 2013 CMAKE_GENERATOR: Visual Studio 15 2017
CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON -DUSE_SHA1=HTTPS CMAKE_OPTIONS: -A Win32 -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON -DUSE_SHA1=HTTPS
RUN_INVASIVE_TESTS: true RUN_INVASIVE_TESTS: true
SKIP_SSH_TESTS: true SKIP_SSH_TESTS: true
- job: windows_mingw_amd64 - job: windows_mingw_amd64
displayName: 'Windows (amd64; MinGW)' displayName: 'Windows (amd64; MinGW)'
pool: Hosted pool:
vmImage: 'vs2017-win2016'
steps: steps:
- bash: . '$(Build.SourcesDirectory)\azure-pipelines\setup-mingw.sh' - bash: . '$(Build.SourcesDirectory)\azure-pipelines\setup-mingw.sh'
displayName: Setup displayName: Setup
...@@ -127,7 +130,8 @@ jobs: ...@@ -127,7 +130,8 @@ jobs:
- job: windows_mingw_x86 - job: windows_mingw_x86
displayName: 'Windows (x86; MinGW)' displayName: 'Windows (x86; MinGW)'
pool: Hosted pool:
vmImage: 'vs2017-win2016'
steps: steps:
- bash: . '$(Build.SourcesDirectory)\azure-pipelines\setup-mingw.sh' - bash: . '$(Build.SourcesDirectory)\azure-pipelines\setup-mingw.sh'
displayName: Setup displayName: Setup
...@@ -147,7 +151,7 @@ jobs: ...@@ -147,7 +151,7 @@ jobs:
- job: linux_x86_bionic_gcc_openssl - job: linux_x86_bionic_gcc_openssl
displayName: 'Linux (x86; Bionic; GCC; OpenSSL)' displayName: 'Linux (x86; Bionic; GCC; OpenSSL)'
pool: pool:
vmImage: 'Ubuntu 16.04' vmImage: 'ubuntu-18.04'
steps: steps:
- template: docker.yml - template: docker.yml
parameters: parameters:
...@@ -164,7 +168,7 @@ jobs: ...@@ -164,7 +168,7 @@ jobs:
- job: linux_x86_bionic_clang_openssl - job: linux_x86_bionic_clang_openssl
displayName: 'Linux (x86; Bionic; Clang; OpenSSL)' displayName: 'Linux (x86; Bionic; Clang; OpenSSL)'
pool: pool:
vmImage: 'Ubuntu 16.04' vmImage: 'ubuntu-18.04'
steps: steps:
- template: docker.yml - template: docker.yml
parameters: parameters:
...@@ -181,7 +185,7 @@ jobs: ...@@ -181,7 +185,7 @@ jobs:
- job: linux_arm32_bionic_gcc_openssl - job: linux_arm32_bionic_gcc_openssl
displayName: 'Linux (arm32; Bionic; GCC; OpenSSL)' displayName: 'Linux (arm32; Bionic; GCC; OpenSSL)'
pool: pool:
vmImage: 'Ubuntu 16.04' vmImage: 'ubuntu-18.04'
steps: steps:
- template: docker.yml - template: docker.yml
parameters: parameters:
...@@ -199,7 +203,7 @@ jobs: ...@@ -199,7 +203,7 @@ jobs:
- job: linux_arm64_bionic_gcc_openssl - job: linux_arm64_bionic_gcc_openssl
displayName: 'Linux (arm64; Bionic; GCC; OpenSSL)' displayName: 'Linux (arm64; Bionic; GCC; OpenSSL)'
pool: pool:
vmImage: 'Ubuntu 16.04' vmImage: 'ubuntu-18.04'
steps: steps:
- template: docker.yml - template: docker.yml
parameters: parameters:
......
...@@ -85,7 +85,7 @@ if [ -z "$SKIP_GITDAEMON_TESTS" ]; then ...@@ -85,7 +85,7 @@ if [ -z "$SKIP_GITDAEMON_TESTS" ]; then
fi fi
if [ -z "$SKIP_PROXY_TESTS" ]; then if [ -z "$SKIP_PROXY_TESTS" ]; then
curl --location --silent https://github.com/ethomson/poxyproxy/releases/download/v0.7.0/poxyproxy-0.7.0.jar >poxyproxy.jar curl --location --silent --show-error https://github.com/ethomson/poxyproxy/releases/download/v0.7.0/poxyproxy-0.7.0.jar >poxyproxy.jar
echo "" echo ""
echo "Starting HTTP proxy (Basic)..." echo "Starting HTTP proxy (Basic)..."
...@@ -97,7 +97,7 @@ if [ -z "$SKIP_PROXY_TESTS" ]; then ...@@ -97,7 +97,7 @@ if [ -z "$SKIP_PROXY_TESTS" ]; then
fi fi
if [ -z "$SKIP_NTLM_TESTS" ]; then if [ -z "$SKIP_NTLM_TESTS" ]; then
curl --location --silent https://github.com/ethomson/poxygit/releases/download/v0.4.0/poxygit-0.4.0.jar >poxygit.jar curl --location --silent --show-error https://github.com/ethomson/poxygit/releases/download/v0.4.0/poxygit-0.4.0.jar >poxygit.jar
echo "" echo ""
echo "Starting HTTP server..." echo "Starting HTTP server..."
......
...@@ -7,6 +7,8 @@ DISABLE_WARNINGS(implicit-fallthrough) ...@@ -7,6 +7,8 @@ DISABLE_WARNINGS(implicit-fallthrough)
IF (HTTPS_BACKEND STREQUAL "SecureTransport") IF (HTTPS_BACKEND STREQUAL "SecureTransport")
ADD_DEFINITIONS(-DCRYPT_COMMONCRYPTO) ADD_DEFINITIONS(-DCRYPT_COMMONCRYPTO)
SET(SRC_NTLMCLIENT_CRYPTO "crypt_commoncrypto.c") SET(SRC_NTLMCLIENT_CRYPTO "crypt_commoncrypto.c")
# CC_MD4 has been deprecated in macOS 10.15.
SET_SOURCE_FILES_PROPERTIES("crypt_commoncrypto.c" COMPILE_FLAGS "-Wno-deprecated")
ELSEIF (HTTPS_BACKEND STREQUAL "OpenSSL") ELSEIF (HTTPS_BACKEND STREQUAL "OpenSSL")
ADD_DEFINITIONS(-DCRYPT_OPENSSL) ADD_DEFINITIONS(-DCRYPT_OPENSSL)
INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
......
...@@ -300,6 +300,10 @@ FILE(GLOB SRC_GIT2 *.c *.h ...@@ -300,6 +300,10 @@ FILE(GLOB SRC_GIT2 *.c *.h
streams/*.c streams/*.h streams/*.c streams/*.h
transports/*.c transports/*.h transports/*.c transports/*.h
xdiff/*.c xdiff/*.h) xdiff/*.c xdiff/*.h)
IF(APPLE)
# The old Secure Transport API has been deprecated in macOS 10.15.
SET_SOURCE_FILES_PROPERTIES(streams/stransport.c PROPERTIES COMPILE_FLAGS -Wno-deprecated)
ENDIF()
# the xdiff dependency is not (yet) warning-free, disable warnings as # the xdiff dependency is not (yet) warning-free, disable warnings as
# errors for the xdiff sources until we've sorted them out # errors for the xdiff sources until we've sorted them out
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment