Skip to content

Commit

Permalink
Dependencies: Update Travis CI script
Browse files Browse the repository at this point in the history
  • Loading branch information
vgrigoriev committed May 22, 2021
1 parent 2f028fc commit 55b6518
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ addon_shortcuts:
clang-10: &clang-10
apt:
sources:
- ubuntu-toolchain-r-test
- sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main'
key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
packages:
Expand All @@ -30,6 +31,7 @@ addon_shortcuts:
clang-11: &clang-11
apt:
sources:
- ubuntu-toolchain-r-test
- sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-11 main'
key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
packages:
Expand All @@ -39,6 +41,7 @@ addon_shortcuts:
clang-12: &clang-12
apt:
sources:
- ubuntu-toolchain-r-test
- sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-12 main'
key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
packages:
Expand Down
4 changes: 2 additions & 2 deletions install_boost.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ BOOST_INSTALL_DIR=${WORK_DIRECTORY}/boost

BOOST_URL="https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION_1}/source/boost_${BOOST_VERSION_2}.tar.gz"

mkdir -p "${BOOST_SOURCE_DIR}" || exit 1
mkdir -p "${BOOST_INSTALL_DIR}" || exit 2
mkdir -v -p "${BOOST_SOURCE_DIR}" || exit 1
mkdir -v -p "${BOOST_INSTALL_DIR}" || exit 2

wget --no-check-certificate --quiet -O - ${BOOST_URL} | tar --strip-components=1 -xz -C "${BOOST_SOURCE_DIR}"
if [ $? -ne 0 ]
Expand Down
7 changes: 4 additions & 3 deletions install_llvm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ LLVM_INSTALL_DIR=${WORK_DIRECTORY}/llvm

LLVM_URL="https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.xz"

mkdir -p "${LLVM_SOURCE_DIR}" || exit 1
mkdir -p "${LLVM_INSTALL_DIR}" || exit 2
mkdir -v -p "${LLVM_SOURCE_DIR}" || exit 1
mkdir -v -p "${LLVM_INSTALL_DIR}" || exit 2

wget --no-check-certificate --quiet -O - ${LLVM_URL} | tar --strip-components=1 -xJ -C "${LLVM_SOURCE_DIR}"
if [ $? -ne 0 ]
Expand All @@ -25,7 +25,8 @@ fi

cd "${LLVM_SOURCE_DIR}" || exit 4

cmake -DCMAKE_CXX_STANDARD=17 \
cmake . \
-DCMAKE_CXX_STANDARD=17 \
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
-DBUILD_SHARED_LIBS=OFF \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
Expand Down
2 changes: 1 addition & 1 deletion sonar_scan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ sonar-scanner \
-Dsonar.language=cpp \
-Dsonar.cpp.std=c++17 \
-Dsonar.issuesReport.html.enable=true \
-Dsonar.projectBaseDir=${PROJECT_DIR} \
-Dsonar.projectBaseDir="${PROJECT_DIR}" \
-Dsonar.sources=common,model,parser,tests \
-Dsonar.cfamily.build-wrapper-output=output \
-Dsonar.cfamily.cache.enabled=false
Expand Down

0 comments on commit 55b6518

Please sign in to comment.