Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
Signed-off-by: Bogdan Vaneev <warchantua@gmail.com>
  • Loading branch information
Warchant committed Sep 29, 2019
1 parent ecd27ce commit 35b2782
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 9 deletions.
20 changes: 14 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,24 @@ on:

jobs:
build:
runs-on: ubuntu-latest
container:
image: soramitsu/kagome-dev:8
env:
TOOLCHAIN: cmake/toolchain/gcc-8_cxx17.cmake
BUILD_DIR: /tmp/build
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v1
name: checkout
with:
submodules: true
clean: true
fetch-depth: 1
- uses: docker://soramitsu/kagome-dev:8
- name: cleanup
run: rm -rf /tmp/build
- name: cmake
run: cmake . -GNinja -B/tmp/build -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain/gcc-8_cxx17.cmake
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_HUNTER_USERNAME: ${{ secrets.GITHUB_HUNTER_USERNAME }}
GITHUB_HUNTER_TOKEN: ${{ secrets.GITHUB_HUNTER_TOKEN }}
run: cmake . -B${BUILD_DIR} -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN}
- name: build
run: ninja -C /tmp/build
run: cmake --build ${BUILD_DIR} -- -j4
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,16 @@ set(CMAKE_TOOLCHAIN_FILE
)


include(cmake/print.cmake)
include("cmake/3rdparty/Hunter/init.cmake")
HunterGate(
URL "https://github.com/ruslo/hunter/archive/v0.23.171.tar.gz"
SHA1 "5d68bcca78eee347239ca5f4d34f4b6c12683154"
LOCAL
)

project(libp2p CXX)

include(cmake/print.cmake)
print("C flags: ${CMAKE_C_FLAGS}")
print("CXX flags: ${CMAKE_CXX_FLAGS}")
print("Using CMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}")
Expand Down
2 changes: 1 addition & 1 deletion cmake/3rdparty/Hunter/init.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ string(COMPARE EQUAL "$ENV{GITHUB_HUNTER_USERNAME}" "" username_is_empty)
# binary cache can be uploaded to soramitsu/hunter-binary-cache so others will not build same dependencies twice
if (NOT password_is_empty AND NOT username_is_empty)
option(HUNTER_RUN_UPLOAD "Upload cache binaries" YES)
message("Binary cache uploading is ENABLED.")
print("Binary cache uploading is ENABLED.")
endif ()

set(
Expand Down
1 change: 1 addition & 0 deletions cmake/toolchain/clang-8_cxx17.cmake
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
include(${CMAKE_CURRENT_LIST_DIR}/../print.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/compiler/clang-8.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/cxx17.cmake)
1 change: 1 addition & 0 deletions cmake/toolchain/gcc-8_cxx17.cmake
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
include(${CMAKE_CURRENT_LIST_DIR}/../print.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/compiler/gcc-8.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/cxx17.cmake)
2 changes: 1 addition & 1 deletion deps/spdlog
Submodule spdlog updated 203 files

0 comments on commit 35b2782

Please sign in to comment.