From 29aa8ef67e2e85b04328d8128a7c0b1991ff424c Mon Sep 17 00:00:00 2001 From: David Chisnall Date: Wed, 10 Apr 2019 13:25:43 +0100 Subject: [PATCH] Give up on new making CI support recent clang-format. Revert to 6.0 and use that locally to insert an extra blank line to make CI happy... --- azure-pipelines.yml | 6 +++--- src/mem/pagemap.h | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 411f8e9..f3b87e2 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -204,10 +204,10 @@ phases: steps: - script: | wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - - sudo apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7.0 main" + sudo apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main" sudo apt-get update - sudo apt-get install -y clang-format-7.0 - sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-7.0 100 + sudo apt-get install -y clang-format-6.0 + sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-6.0 100 bash check-format.sh diff --git a/src/mem/pagemap.h b/src/mem/pagemap.h index 08f1601..75f786f 100644 --- a/src/mem/pagemap.h +++ b/src/mem/pagemap.h @@ -348,5 +348,4 @@ namespace snmalloc } while (length > 0); } }; - }