Fix merge

qdrvm · Oct 13, 2022 · 8dd155d · 8dd155d
1 parent e9108f0
commit 8dd155d
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/housekeeping/ci_install_mold.sh 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
@@ -18,13 +18,12 @@ 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 \
    -e CTEST_OUTPUT_ON_FAILURE \
    -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
diff --git a/test/external-project-test/cmake/clang-14-cpp17-toolchain.cmake b/test/external-project-test/cmake/clang-14-cpp17-toolchain.cmake
diff --git a/test/external-project-test/cmake/cpp17-toolchain.cmake b/test/external-project-test/cmake/cpp17-toolchain.cmake