From e2ee00e36e09b63d8700c2e28a3cc12935469aab Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Fri, 30 Aug 2019 14:50:40 -0700 Subject: [PATCH] Fix Linux CI on GitHub --- build/linux/ci-common.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/build/linux/ci-common.sh b/build/linux/ci-common.sh index a7b1994b2e..59ea0e4ff4 100755 --- a/build/linux/ci-common.sh +++ b/build/linux/ci-common.sh @@ -2,6 +2,7 @@ # version of clang we want to use CLANG_VERSION=7 +GITHUB_CLANG_VERSION=8 # version of libcxx and libcxxabi we want to use CXX_VERSION=7.0.0 # version of CMake to use instead of the default one @@ -9,10 +10,17 @@ CMAKE_VERSION=3.13.4 # version of ninja to use NINJA_VERSION=1.8.2 +# Steps for GitHub Workflows +if [[ "$GITHUB_WORKFLOW" ]]]; then + sudo wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - + sudo apt-get install clang-$GITHUB_CLANG_VERSION libc++-$GITHUB_CLANG_VERSION-dev libc++abi-$GITHUB_CLANG_VERSION-dev + sudo apt-get install cmake +fi + # Steps specific to our CI environment # CI runs on Ubuntu 14.04, we need to install clang-7.0 and the # appropriate libc++ ourselves -if [[ "$CONTINUOUS_INTEGRATION" ]]; then +if [[ "$KOKORO_BUILD_ID" ]]; then sudo ln -s /usr/include/x86_64-linux-gnu/asm /usr/include/asm if [[ "$FILAMENT_ANDROID_CI_BUILD" ]]; then