Commit e0ce3d9d by Patrick Steinhardt

ci: perform clang builds on Linux

(cherry picked from commit dc6e80e2)
parent d92cff19
...@@ -2,8 +2,8 @@ resources: ...@@ -2,8 +2,8 @@ resources:
- repo: self - repo: self
phases: phases:
- phase: linux_trusty_openssl - phase: linux_trusty_gcc_openssl
displayName: 'Linux (Trusty; OpenSSL)' displayName: 'Linux (Trusty; GCC; OpenSSL)'
queue: queue:
name: 'Hosted Linux Preview' name: 'Hosted Linux Preview'
steps: steps:
...@@ -26,7 +26,40 @@ phases: ...@@ -26,7 +26,40 @@ phases:
volumes: | volumes: |
$(Build.SourcesDirectory):/src $(Build.SourcesDirectory):/src
$(Build.BinariesDirectory):/build $(Build.BinariesDirectory):/build
envVars: 'LEAK_CHECK=valgrind' envVars: |
CC=gcc
LEAK_CHECK=valgrind
workDir: '/build'
containerCommand: '/src/ci/test.sh'
detached: false
- phase: linux_trusty_clang_openssl
displayName: 'Linux (Trusty; Clang; OpenSSL)'
queue:
name: 'Hosted Linux Preview'
steps:
- task: Docker@0
displayName: Build
inputs:
action: 'Run an image'
imageName: 'ethomson/libgit2-trusty-openssl:latest'
volumes: |
$(Build.SourcesDirectory):/src
$(Build.BinariesDirectory):/build
workDir: '/build'
containerCommand: '/src/ci/build.sh'
detached: false
- task: Docker@0
displayName: Test
inputs:
action: 'Run an image'
imageName: 'ethomson/libgit2-trusty-openssl:latest'
volumes: |
$(Build.SourcesDirectory):/src
$(Build.BinariesDirectory):/build
envVars: |
CC=clang
LEAK_CHECK=valgrind
workDir: '/build' workDir: '/build'
containerCommand: '/src/ci/test.sh' containerCommand: '/src/ci/test.sh'
detached: false detached: false
......
...@@ -9,6 +9,7 @@ set -e ...@@ -9,6 +9,7 @@ set -e
SOURCE_DIR=${SOURCE_DIR:-$( cd "$( dirname "${BASH_SOURCE[0]}" )" && dirname $( pwd ) )} SOURCE_DIR=${SOURCE_DIR:-$( cd "$( dirname "${BASH_SOURCE[0]}" )" && dirname $( pwd ) )}
BUILD_DIR=$(pwd) BUILD_DIR=$(pwd)
CC=${CC:-cc}
indent() { sed "s/^/ /"; } indent() { sed "s/^/ /"; }
...@@ -20,7 +21,7 @@ uname -a 2>&1 | indent ...@@ -20,7 +21,7 @@ uname -a 2>&1 | indent
echo "CMake version:" echo "CMake version:"
cmake --version 2>&1 | indent cmake --version 2>&1 | indent
echo "Compiler version:" echo "Compiler version:"
gcc --version 2>&1 | indent $CC --version 2>&1 | indent
echo "" echo ""
echo "##############################################################################" echo "##############################################################################"
......
...@@ -3,6 +3,6 @@ ...@@ -3,6 +3,6 @@
set -x set -x
apt-get update apt-get update
apt-get -y install build-essential pkg-config cmake openssl libssl-dev libssh2-1-dev libcurl4-gnutls-dev openssh-server apt-get -y install build-essential pkg-config clang cmake openssl libssl-dev libssh2-1-dev libcurl4-gnutls-dev openssh-server
mkdir -p /var/run/sshd mkdir -p /var/run/sshd
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