This is an automated email from the ASF dual-hosted git repository.

jdanek pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git


The following commit(s) were added to refs/heads/main by this push:
     new 05f506b  NO-JIRA Workaround apt-get issues and update clang to 12 in 
Travis CI (#1198)
05f506b is described below

commit 05f506b4224d27a22d6eae4232e97dc0c7556610
Author: Jiri DanÄ›k <[email protected]>
AuthorDate: Sat May 8 00:46:22 2021 +0200

    NO-JIRA Workaround apt-get issues and update clang to 12 in Travis CI 
(#1198)
---
 .travis.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 46ca93b..7055ae7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,6 @@ jobs:
     - name: "qdrouterd:TSAN"
     - arch: arm64
     - arch: s390x
-    - name: "qdrouterd:RelWithDebInfo+MemoryDebug (clang on focal)"
   include:
   - name: "apache-rat:check"
     os: linux
@@ -71,7 +70,12 @@ jobs:
     dist: focal
     compiler: clang
     before_install:
-    - sudo apt-get install clang-11 llvm-11-dev
+    # 
https://travis-ci.community/t/clang-10-was-recently-broken-on-linux-unmet-dependencies-for-clang-10-clang-tidy-10-valgrind/11527
+    - sudo apt-get install -yq --allow-downgrades libc6=2.31-0ubuntu9.2 
libc6-dev=2.31-0ubuntu9.2
+    - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key 2>/dev/null | sudo 
apt-key add -
+    - sudo add-apt-repository 'deb http://apt.llvm.org/focal/ 
llvm-toolchain-focal-12 main' -y
+    - sudo apt-get update -q
+    - sudo apt-get install -y clang-12 llvm-12-dev -o 
Debug::pkgProblemResolver=yes
     # https://github.com/pypa/virtualenv/issues/1740
     # https://github.com/pypa/virtualenv/issues/1873
     - python -m pip install --user --upgrade pip
@@ -84,8 +88,8 @@ jobs:
     - python -m pip install --user grpcio protobuf
     env:
     - QPID_SYSTEM_TEST_TIMEOUT=300
-    - CC=clang-11
-    - CXX=clang++-11
+    - CC=clang-12
+    - CXX=clang++-12
     - PATH="/usr/bin:$PATH" PROTON_VERSION=main BUILD_TYPE=RelWithDebInfo
     - DISPATCH_CMAKE_ARGS='-DRUNTIME_CHECK=asan 
-DCMAKE_C_FLAGS=-DQD_MEMORY_DEBUG'
     - DISPATCH_CTEST_EXTRA='-E 
system_tests_http1_adaptor|system_tests_http2|system_tests_grpc'
@@ -93,8 +97,6 @@ jobs:
     arch: s390x
     os: linux
     dist: focal
-    python:
-      - "3.9"
     before_install:
       # Install and use the latest Node.js LTS version
       - nvm install "lts/*"

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to