From 8dd155d0930d27a676e65097832afef3a72cbf06 Mon Sep 17 00:00:00 2001 From: Harrm Date: Thu, 13 Oct 2022 15:07:45 +0300 Subject: [PATCH] Fix merge --- housekeeping/ci_install_mold.sh | 11 +++++++++++ housekeeping/indocker.sh | 5 ++--- .../cmake/clang-11-cpp17-toolchain.cmake | 1 - .../cmake/clang-14-cpp17-toolchain.cmake | 1 - .../external-project-test/cmake/cpp17-toolchain.cmake | 4 ---- 5 files changed, 13 insertions(+), 9 deletions(-) create mode 100755 housekeeping/ci_install_mold.sh delete mode 100644 test/external-project-test/cmake/clang-11-cpp17-toolchain.cmake delete mode 100644 test/external-project-test/cmake/clang-14-cpp17-toolchain.cmake delete mode 100644 test/external-project-test/cmake/cpp17-toolchain.cmake diff --git a/housekeeping/ci_install_mold.sh b/housekeeping/ci_install_mold.sh new file mode 100755 index 0000000000..c7f7d0c567 --- /dev/null +++ b/housekeeping/ci_install_mold.sh @@ -0,0 +1,11 @@ +#!/bin/bash -xe + +if [ "$CI" != "true" ] || [ "$GITHUB_ACTIONS" != "true" ]; then + echo "CI=true GITHUB_ACTIONS=true are required" + exit -1 +fi + +wget -q -O- https://github.com/rui314/mold/releases/download/v1.3.1/mold-1.3.1-x86_64-linux.tar.gz | tar -C /usr/local --strip-components=1 -xzf - +if [ "$1" == "--make-default" ]; then + ln -sf /usr/local/bin/mold $(realpath /usr/bin/ld) +fi diff --git a/housekeeping/indocker.sh b/housekeeping/indocker.sh index 0131f63e72..7a7a89bc80 100755 --- a/housekeeping/indocker.sh +++ b/housekeeping/indocker.sh @@ -18,7 +18,7 @@ docker build -t soramitsu/kagome:local-dev $DIR rm $DIR/Dockerfile -docker run -it --rm \ +docker run -i --rm \ --cap-add SYS_PTRACE \ -v /tmp/cache/hunter:/root/.hunter \ -w /workdir \ @@ -26,5 +26,4 @@ docker run -it --rm \ -e CODECOV_TOKEN \ -e SONAR_TOKEN \ $CI_ENV \ - soramitsu/kagome:local-dev \ - /bin/bash + soramitsu/kagome:local-dev diff --git a/test/external-project-test/cmake/clang-11-cpp17-toolchain.cmake b/test/external-project-test/cmake/clang-11-cpp17-toolchain.cmake deleted file mode 100644 index 536e4a008d..0000000000 --- a/test/external-project-test/cmake/clang-11-cpp17-toolchain.cmake +++ /dev/null @@ -1 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/cpp17-toolchain.cmake") \ No newline at end of file diff --git a/test/external-project-test/cmake/clang-14-cpp17-toolchain.cmake b/test/external-project-test/cmake/clang-14-cpp17-toolchain.cmake deleted file mode 100644 index 536e4a008d..0000000000 --- a/test/external-project-test/cmake/clang-14-cpp17-toolchain.cmake +++ /dev/null @@ -1 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/cpp17-toolchain.cmake") \ No newline at end of file diff --git a/test/external-project-test/cmake/cpp17-toolchain.cmake b/test/external-project-test/cmake/cpp17-toolchain.cmake deleted file mode 100644 index 5c08ad5d6c..0000000000 --- a/test/external-project-test/cmake/cpp17-toolchain.cmake +++ /dev/null @@ -1,4 +0,0 @@ - -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_CXX_EXTENSIONS OFF)