From 3a2158dff3134ee2966ae86e2cea5adc21351f79 Mon Sep 17 00:00:00 2001 From: John Turpish Date: Thu, 10 Oct 2024 16:52:49 -0400 Subject: [PATCH] Gosh, why does Ubuntu have to be so stupid? --- .github/tour.sh | 5 +++-- .github/ut.sh | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/tour.sh b/.github/tour.sh index 63cb675d..b7244824 100755 --- a/.github/tour.sh +++ b/.github/tour.sh @@ -17,8 +17,9 @@ grep -n . ipfs_client_clitester/conanfile.txt echo Install dependencies. sudo apt-get update -sudo apt-get install --yes cmake ninja-build binutils libc6{,-dev} -pip3 install conan +sudo apt-get install --yes cmake ninja-build binutils libc6{,-dev} pipx +pipx ensurepath +pipx install conan conan profile detect || echo "Profile detection failed. Perhaps the default profile already existed - perhaps this user has already done some conan-based builds." sed -i 's,compiler.cppstd=.*$,compiler.cppstd=20,' "$(conan profile path default)" conan profile show diff --git a/.github/ut.sh b/.github/ut.sh index b83c3267..ce7acddd 100755 --- a/.github/ut.sh +++ b/.github/ut.sh @@ -2,7 +2,9 @@ echo Install dependencies sudo apt-get update - sudo apt-get install --yes cmake ninja-build lcov binutils doxygen graphviz libc6{,-dev} valgrind + sudo apt-get install --yes cmake ninja-build lcov binutils doxygen graphviz libc6{,-dev} valgrind pipx + pipx ensurepath + pipx install conan npm install -g @marp-team/marp-cli g++ --version clang++ --version