From 5cf892bba617819e1c700c907e78be4365bab922 Mon Sep 17 00:00:00 2001 From: Jared Roesch Date: Thu, 1 Apr 2021 10:27:12 -0700 Subject: [PATCH] [CI] Rust CI Changes (#7773) * Tweak CI * WIP * CI Tweaks for Rust CI * Fix * Fix LLVM issue --- docker/install/ubuntu1804_install_llvm.sh | 2 +- docker/install/ubuntu_install_core.sh | 8 ++++---- docker/install/ubuntu_install_llvm.sh | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/install/ubuntu1804_install_llvm.sh b/docker/install/ubuntu1804_install_llvm.sh index 292fdde0444e8..e1b9a1c59629e 100755 --- a/docker/install/ubuntu1804_install_llvm.sh +++ b/docker/install/ubuntu1804_install_llvm.sh @@ -42,4 +42,4 @@ echo deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic main\ >> /etc/apt/sources.list.d/llvm.list wget -q -O - http://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add - -apt-get update && apt-get install -y llvm-9 llvm-10 llvm-11 clang-9 clang-10 clang-11 +apt-get update && apt-get install -y llvm-9 llvm-10 llvm-11 clang-9 libclang-9-dev clang-10 libclang-10-dev clang-11 libclang-11-dev diff --git a/docker/install/ubuntu_install_core.sh b/docker/install/ubuntu_install_core.sh index bb40b052ded38..6f9d791a650dc 100755 --- a/docker/install/ubuntu_install_core.sh +++ b/docker/install/ubuntu_install_core.sh @@ -6,9 +6,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -23,8 +23,8 @@ set -o pipefail # install libraries for building c++ core on ubuntu apt-get update && apt-get install -y --no-install-recommends \ git make libgtest-dev cmake wget unzip libtinfo-dev libz-dev\ - libcurl4-openssl-dev libopenblas-dev g++ sudo \ - apt-transport-https graphviz + libcurl4-openssl-dev libssl-dev libopenblas-dev g++ sudo \ + apt-transport-https graphviz pkg-config cd /usr/src/gtest && cmake CMakeLists.txt && make && cp *.a /usr/lib diff --git a/docker/install/ubuntu_install_llvm.sh b/docker/install/ubuntu_install_llvm.sh index 46607b09d3dac..1f4eec6ee6efb 100755 --- a/docker/install/ubuntu_install_llvm.sh +++ b/docker/install/ubuntu_install_llvm.sh @@ -46,4 +46,4 @@ echo deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial main\ >> /etc/apt/sources.list.d/llvm.list wget -q -O - http://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add - -apt-get update && apt-get install -y llvm-4.0 llvm-9 llvm-8 llvm-7 clang-9 clang-8 clang-7 +apt-get update && apt-get install -y llvm-4.0 llvm-9 llvm-8 llvm-7 clang-9 libclang-9-dev clang-8 libclang-8-dev clang-7 libclang-7-dev