ci: update llvm 10 => 11
parent
c19dcafa17
commit
74e3ffa9b4
|
@ -5,14 +5,14 @@ set -e
|
|||
|
||||
BUILDDIR="$(pwd)"
|
||||
|
||||
sudo sh -c 'echo "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main" >> /etc/apt/sources.list'
|
||||
sudo sh -c 'echo "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-11 main" >> /etc/apt/sources.list'
|
||||
wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
|
||||
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
|
||||
sudo apt-get update -q
|
||||
|
||||
sudo apt-get remove -y llvm-*
|
||||
sudo rm -rf /usr/local/*
|
||||
sudo apt-get install -y libxml2-dev libclang-10-dev llvm-10 llvm-10-dev liblld-10-dev cmake s3cmd gcc-7 g++-7 ninja-build tidy
|
||||
sudo apt-get install -y libxml2-dev libclang-11-dev llvm-11 llvm-11-dev liblld-11-dev cmake s3cmd gcc-7 g++-7 ninja-build tidy
|
||||
|
||||
QEMUBASE="qemu-linux-x86_64-5.1.0"
|
||||
wget https://ziglang.org/deps/$QEMUBASE.tar.xz
|
||||
|
@ -44,7 +44,7 @@ VERSION="$(./zig version)"
|
|||
if [ "${BUILD_REASON}" != "PullRequest" ]; then
|
||||
ARTIFACTSDIR="$BUILDDIR/artifacts"
|
||||
mkdir "$ARTIFACTSDIR"
|
||||
docker run -i --mount type=bind,source="$ARTIFACTSDIR",target=/z ziglang/static-base:llvm10-x86_64-1 -j2 $BUILD_SOURCEVERSION
|
||||
docker run -i --mount type=bind,source="$ARTIFACTSDIR",target=/z ziglang/static-base:llvm11-x86_64-1 -j2 $BUILD_SOURCEVERSION
|
||||
TARBALL="$(ls $ARTIFACTSDIR)"
|
||||
mv "$DOWNLOADSECUREFILE_SECUREFILEPATH" "$HOME/.s3cfg"
|
||||
s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" "$ARTIFACTSDIR/$TARBALL" s3://ziglang.org/builds/
|
||||
|
|
|
@ -5,24 +5,24 @@ set -e
|
|||
|
||||
system_profiler SPHardwareDataType
|
||||
|
||||
brew install s3cmd gcc@9
|
||||
brew install s3cmd gcc@10
|
||||
|
||||
ZIGDIR="$(pwd)"
|
||||
LLVMVER="10.0.1"
|
||||
LLVMVER="11.0.0"
|
||||
ARCH="x86_64"
|
||||
CACHE_BASENAME="llvm+clang+lld-$LLVMVER-$ARCH-macosx-gcc9-release"
|
||||
CACHE_BASENAME="llvm+clang+lld-$LLVMVER-$ARCH-macosx-gcc10-release"
|
||||
PREFIX="$HOME/$CACHE_BASENAME"
|
||||
JOBS="-j2"
|
||||
|
||||
# I tried using the system default compiler (clang), but it couldn't statically link libc++.
|
||||
# So we use gcc-9 from homebrew.
|
||||
export CC=gcc-9
|
||||
export CXX=g++-9
|
||||
# So we use gcc-10 from homebrew.
|
||||
export CC=gcc-10
|
||||
export CXX=g++-10
|
||||
|
||||
rm -rf $PREFIX
|
||||
|
||||
cd $HOME
|
||||
wget -nv "https://ziglang.org/builds/$CACHE_BASENAME.tar.xz"
|
||||
wget -nv "https://ziglang.org/deps/$CACHE_BASENAME.tar.xz"
|
||||
tar xf "$CACHE_BASENAME.tar.xz"
|
||||
|
||||
cd $ZIGDIR
|
||||
|
|
|
@ -7,5 +7,5 @@ pacman -Su --needed --noconfirm
|
|||
pacman -S --needed --noconfirm wget p7zip python3-pip tar xz
|
||||
|
||||
pip install s3cmd
|
||||
wget -nv "https://ziglang.org/deps/llvm%2bclang%2blld-10.0.0-x86_64-windows-msvc-release-mt.tar.xz"
|
||||
tar xf llvm+clang+lld-10.0.0-x86_64-windows-msvc-release-mt.tar.xz
|
||||
wget -nv "https://ziglang.org/deps/llvm%2bclang%2blld-11.0.0-x86_64-windows-msvc-release-mt.tar.xz"
|
||||
tar xf llvm+clang+lld-11.0.0-x86_64-windows-msvc-release-mt.tar.xz
|
||||
|
|
|
@ -11,7 +11,7 @@ SET "MSYSTEM=%PREVMSYSTEM%"
|
|||
|
||||
SET "ZIGBUILDDIR=%SRCROOT%\build"
|
||||
SET "ZIGINSTALLDIR=%ZIGBUILDDIR%\dist"
|
||||
SET "ZIGPREFIXPATH=%SRCROOT%\llvm+clang+lld-10.0.0-x86_64-windows-msvc-release-mt"
|
||||
SET "ZIGPREFIXPATH=%SRCROOT%\llvm+clang+lld-11.0.0-x86_64-windows-msvc-release-mt"
|
||||
|
||||
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@ platform:
|
|||
|
||||
steps:
|
||||
- name: build-and-test
|
||||
image: ziglang/static-base:llvm10-aarch64-1
|
||||
image: ziglang/static-base:llvm11-aarch64-1
|
||||
environment:
|
||||
SRHT_OAUTH_TOKEN:
|
||||
from_secret: SRHT_OAUTH_TOKEN
|
||||
|
|
|
@ -7,7 +7,7 @@ sudo pkg update -fq
|
|||
sudo pkg install -y cmake py27-s3cmd wget curl jq
|
||||
|
||||
ZIGDIR="$(pwd)"
|
||||
CACHE_BASENAME="llvm+clang+lld-10.0.0-x86_64-freebsd-release"
|
||||
CACHE_BASENAME="llvm+clang+lld-11.0.0-x86_64-freebsd-release"
|
||||
PREFIX="$HOME/$CACHE_BASENAME"
|
||||
JOBS="-j$(sysctl -n hw.ncpu)"
|
||||
|
||||
|
|
Loading…
Reference in New Issue