Skip to content

Commit

Permalink
Use LLVM 9 in CI
Browse files Browse the repository at this point in the history
 * Trying to pin the LLVM Version to LLVM 9
 * Install LLVM@9 from Brew
 * Pin the brew version too.
 * Update macOS Build Image
 * Dump Toolchain Version on Build

   Get version information for `clang` and `rustc`. Clang is used for
   linking so knwing the LLVM Version it is using is useful.
 * Update Ubuntu Base Box
 * Ubuntu 20
 * Add LLVM 9 to Path on Linux
  • Loading branch information
iwillspeak committed Aug 15, 2020
1 parent 0998848 commit 4b78bdf
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 24 deletions.
12 changes: 6 additions & 6 deletions .ci/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM ubuntu:18.04
RUN apt-get update && \
apt-get install -y curl gnupg2 && \
curl -sS https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
COPY llvm.list /etc/apt/sources.list.d/
FROM ubuntu:20.04
RUN apt-get update && \
apt-get install -y wget curl gnupg2 lsb-release software-properties-common && \
curl -O https://apt.llvm.org/llvm.sh && \
chmod +x llvm.sh && \
./llvm.sh 9 && \
apt-get install -y sudo && \
apt-get install -y python3 && \
apt-get install -y clang binutils && \
apt-get install -y llvm-9-dev && \
apt-get install -y clang binutils && \
apt-get install -y zlib1g-dev
4 changes: 2 additions & 2 deletions .ci/buildbase-pipelines.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pool:

trigger:
paths:
include:
include:
- '.ci'

variables:
Expand All @@ -17,4 +17,4 @@ steps:
docker push $(dockerId)/$(imageName)
workingDirectory: .ci
env:
pswd: $(dockerPassword)
pswd: $(dockerPassword)
12 changes: 0 additions & 12 deletions .ci/llvm.list

This file was deleted.

10 changes: 6 additions & 4 deletions azure-pipelines.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,17 @@ resources:
jobs:
- job: macOS
pool:
vmImage: 'macOS-10.14'
vmImage: 'macOS-10.15'
steps:
- script: 'brew install llvm'
- script: 'brew install llvm\@9'
displayName: Brew install LLVM
- script: "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs -o rustup.sh && sh rustup.sh -y"
displayName: Rustup
- script: |
export PATH=/usr/local/bin:$PATH # Local bin (brew)
source ~/.cargo/env
export LLVM_SYS_90_PREFIX=/usr/local/opt/llvm
export LLVM_SYS_90_PREFIX=/usr/local/opt/llvm\@9
export LLVM_CONFIG_PATH=${LLVM_SYS_90_PREFIX}/bin/llvm-config
cargo install just
./build.sh test
displayName: './build.sh test'
Expand All @@ -33,8 +34,9 @@ jobs:
displayName: Rustup
- script: |
source ~/.cargo/env
export PATH=${PATH}:~/.local/bin/
export PATH=${PATH}:~/.local/bin/:/usr/lib/llvm-9/bin
export LLVM_SYS_90_PREFIX=/usr/lib/llvm-9
export LLVM_CONFIG_PATH=${LLVM_SYS_90_PREFIX}/bin/llvm-config
cargo install just
./build.sh test
displayName: './build.sh test'
6 changes: 6 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,10 @@ function check_for()

check_for python3

echo "Clang version:"
clang --version

echo "Rust version"
rustc --version

just "$@"

0 comments on commit 4b78bdf

Please sign in to comment.