Skip to content

Commit

Permalink
[CI] Rust CI Changes (#7773)
Browse files Browse the repository at this point in the history
* Tweak CI

* WIP

* CI Tweaks for Rust CI

* Fix

* Fix LLVM issue
  • Loading branch information
jroesch committed Apr 1, 2021
1 parent b95803f commit 8e35840
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion docker/install/ubuntu1804_install_llvm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions docker/install/ubuntu_install_core.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion docker/install/ubuntu_install_llvm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 8e35840

Please sign in to comment.