From 435a4c969c0f080c89b0aa96f35dc64e0d3f76f7 Mon Sep 17 00:00:00 2001 From: srz_zumix Date: Sun, 12 Apr 2020 20:35:05 +0900 Subject: [PATCH] add key --- .ci/linux/install-clang.sh | 6 +++--- .ci/linux/install-gcc.sh | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.ci/linux/install-clang.sh b/.ci/linux/install-clang.sh index 299d63d9b5..4d7a07fcab 100755 --- a/.ci/linux/install-clang.sh +++ b/.ci/linux/install-clang.sh @@ -11,12 +11,12 @@ fi wget -qO - http://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - sudo add-apt-repository -y "deb http://apt.llvm.org/${VERSION_CODENAME}/ llvm-toolchain-${VERSION_CODENAME}-${CLANG_VERSION} main" sudo apt-get -y --allow-unauthenticated update -sudo apt-get -qq install clang-${CLANG_VERSION} +sudo apt-get -qq install "clang-${CLANG_VERSION}" if $INSATLL_CLANG_TOOLS; then - sudo apt-get -y --force-yes -qq install clang-$CLANG_VERSION clang-tools-$CLANG_VERSION - CLANG_SLAVES="--slave /usr/bin/scan-build scan-build /usr/bin/scan-build-$CLANG_VERSION" + sudo apt-get -y --force-yes -qq install "clang-tools-${CLANG_VERSION}" + CLANG_SLAVES="--slave /usr/bin/scan-build scan-build /usr/bin/scan-build-${CLANG_VERSION}" fi sudo update-alternatives --install /usr/bin/clang clang \ diff --git a/.ci/linux/install-gcc.sh b/.ci/linux/install-gcc.sh index 375eee592a..6e20b05c84 100755 --- a/.ci/linux/install-gcc.sh +++ b/.ci/linux/install-gcc.sh @@ -7,9 +7,10 @@ if [ -z ${GCC_VERSION+x} ]; then return fi -sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test || true -sudo apt-get -y update -sudo apt-get -qq install g++-${GCC_VERSION} +curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - +sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test +sudo apt-get -y --allow-unauthenticated update +sudo apt-get -qq install "g++-${GCC_VERSION}" sudo update-alternatives --install /usr/bin/gcc gcc \ /usr/bin/gcc-${GCC_VERSION} 90 \ --slave /usr/bin/g++ g++ /usr/bin/g++-${GCC_VERSION}