From 7f039284c2e607bf345027eac85997c8c4a23b6e Mon Sep 17 00:00:00 2001 From: Sebastian Ullrich Date: Mon, 28 Oct 2019 17:21:59 +0100 Subject: [PATCH] chore: switch back to clang 8 We observed some rare, random test failures since switching to clang 9, so we are going back to LLVM 8 for the time being --- azure-pipelines.yml | 2 +- default.nix | 2 +- shell.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 067bfc0fb295..b870d1faf7f4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -52,7 +52,7 @@ jobs: steps: - script: | choco install -y msys2 - C:\tools\msys64\usr\bin\bash -lc "pacman --noconfirm -S make python mingw-w64-x86_64-cmake mingw-w64-x86_64-clang mingw-w64-x86_64-polly git diffutils" + C:\tools\msys64\usr\bin\bash -lc "pacman --noconfirm -S make python mingw-w64-x86_64-cmake git diffutils && pacman -U http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-llvm-8.0.1-3-any.pkg.tar.xz http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-clang-8.0.1-3-any.pkg.tar.xz" displayName: Setup - script: | C:\tools\msys64\usr\bin\bash -l ./script/ci.sh diff --git a/default.nix b/default.nix index 849cac081eb8..b97bbb56e30e 100644 --- a/default.nix +++ b/default.nix @@ -1,3 +1,3 @@ -{ pkgs ? import ./nix/nixpkgs.nix, llvmPackages ? pkgs.llvmPackages_9 }: +{ pkgs ? import ./nix/nixpkgs.nix, llvmPackages ? pkgs.llvmPackages_8 }: pkgs.callPackage ./nix/derivation.nix { inherit llvmPackages; } diff --git a/shell.nix b/shell.nix index 891920e5fd8d..cbe092ceec74 100644 --- a/shell.nix +++ b/shell.nix @@ -1,4 +1,4 @@ -{ pkgs ? import ./nix/nixpkgs.nix, llvmPackages ?pkgs.llvmPackages_9 } @ args: +{ pkgs ? import ./nix/nixpkgs.nix, llvmPackages ? pkgs.llvmPackages_8 } @ args: let lean = import ./default.nix args;