File tree Expand file tree Collapse file tree 5 files changed +27
-3
lines changed
vcpkg-overlay/kagome-crates Expand file tree Collapse file tree 5 files changed +27
-3
lines changed Original file line number Diff line number Diff line change @@ -13,6 +13,10 @@ main() {
1313 linux_deb)
1414 echo " === Detected Linux system with apt"
1515 apt update && apt install -y $LINUX_PACKAGES
16+ if [ -f " $HOME /.cargo/env" ]; then
17+ source " $HOME /.cargo/env"
18+ fi
19+ export PATH=" $HOME /.cargo/bin:$PATH "
1620 ;;
1721 linux_other)
1822 echo " === Detected Linux system without apt"
@@ -31,6 +35,12 @@ main() {
3135 echo " === Unknown system"
3236 ;;
3337 esac
38+
39+ if command -v cargo > /dev/null 2>&1 ; then
40+ echo " === Cargo is available: $( cargo --version) "
41+ else
42+ echo " === Warning: Cargo is not available in PATH"
43+ fi
3444}
3545
3646main
Original file line number Diff line number Diff line change 1919env :
2020 USE_CACHE : ${{ github.event.inputs.use_cache || 'true' }}
2121 CACHE_VERSION : v01
22+ CARGO_HOME : ~/.cargo
23+ RUSTUP_HOME : ~/.rustup
2224 CACHE_PATH : |
2325 ~/.cargo
2426 ~/.hunter
4345 submodules : true
4446 fetch-depth : 0
4547
48+ - name : " Set up Rust"
49+ uses : dtolnay/rust-toolchain@stable
50+ with :
51+ toolchain : stable
52+
4653 - name : " Restore cache dependencies"
4754 id : cache-restore
4855 if : ${{ env.USE_CACHE == 'true' }}
6269 else
6370 ./.ci/scripts/init.sh
6471 fi
72+ echo "$HOME/.cargo/bin" >> $GITHUB_PATH
6573
6674 - name : " Init all dependencies"
6775 run : |
Original file line number Diff line number Diff line change @@ -21,6 +21,8 @@ project(cpp-jam
2121 LANGUAGES CXX
2222)
2323
24+ include (GNUInstallDirs)
25+
2426message (STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE} " )
2527message (STATUS "Boost_DIR: ${Boost_DIR} " )
2628
@@ -32,6 +34,7 @@ pkg_check_modules(libb2 REQUIRED IMPORTED_TARGET GLOBAL libb2)
3234find_package (Boost CONFIG REQUIRED COMPONENTS algorithm outcome program_options)
3335find_package (fmt CONFIG REQUIRED)
3436find_package (yaml-cpp CONFIG REQUIRED)
37+ find_package (kagome-crates CONFIG REQUIRED)
3538find_package (jam_crust CONFIG REQUIRED)
3639find_package (scale CONFIG REQUIRED)
3740find_package (soralog CONFIG REQUIRED)
Original file line number Diff line number Diff line change @@ -8,8 +8,8 @@ set(BUILD_VERSION_CPP "${CMAKE_BINARY_DIR}/generated/app/build_version.cpp")
88set (GET_VERSION_SCRIPT "${CMAKE_SOURCE_DIR} /scripts/get_version.sh" )
99add_custom_command (
1010 OUTPUT ${BUILD_VERSION_CPP}
11- COMMAND echo "// Auto-generated file\\ n " > ${BUILD_VERSION_CPP}
12- COMMAND echo "#include <string>\\ n " >> ${BUILD_VERSION_CPP}
11+ COMMAND echo "// Auto-generated file" > ${BUILD_VERSION_CPP}
12+ COMMAND echo "#include <string>" >> ${BUILD_VERSION_CPP}
1313 COMMAND echo "namespace jam {" >> ${BUILD_VERSION_CPP}
1414 COMMAND echo " const std::string &buildVersion() {" >> ${BUILD_VERSION_CPP}
1515 COMMAND printf " static const std::string buildVersion(\" " >> ${BUILD_VERSION_CPP}
Original file line number Diff line number Diff line change @@ -5,7 +5,10 @@ vcpkg_from_github(
55 REF 9011440d56d51bb33e7c4c6a47e85314178ce87f
66 SHA512 f0b1b0e1ed6e20d149d5639e14c231a46f3cdaaa6bfa320bfd64e88c4ed0496fa4246c3135e0032647c05c2aaac02804b565fbeae34b1625771114c8b263920d
77)
8- vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH} " )
8+ vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH} "
9+ OPTIONS
10+ -DQDRVM_BIND_CRATES=schnorrkel;bandersnatch_vrfs
11+ )
912vcpkg_cmake_install()
1013vcpkg_cmake_config_fixup(PACKAGE_NAME "kagome-crates" )
1114file (REMOVE_RECURSE "${CURRENT_PACKAGES_DIR} /debug/include" )
You can’t perform that action at this time.
0 commit comments