Skip to content

Commit c234637

Browse files
committed
fix ci build (#348)
1 parent f6577ec commit c234637

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.github/workflows/fast.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,12 @@ jobs:
2929
fail-fast: true
3030
steps:
3131
- uses: actions/checkout@v2
32-
- name: cmake
32+
- name: prepare build
3333
run: |
3434
mkdir build
3535
cd build
36-
cmake ..
37-
- name: ctest
36+
cmake -DCMAKE_BUILD_TYPE=Debug ..
37+
- name: test
3838
run: |
3939
cd build
40-
cmake --build . -j3 --target tests # temporary workaround (I hope)
41-
ctest -C Debug --output-on-failure
40+
cmake --build . --target check -j3

.github/workflows/slow.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ jobs:
3434
- name: CMake from superproject
3535
run: |
3636
cd ..
37-
cmake -DBOOST_ENABLE_CMAKE=1 -DBoost_VERBOSE=1 $GITHUB_WORKSPACE
38-
ctest -j2 --output-on-failure -R boost_histogram
37+
cmake -DBoost_VERBOSE=1 $GITHUB_WORKSPACE
38+
cmake --build . --target all -j3 -- -k
3939
4040
appleclang:
4141
runs-on: macos-latest

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
5151

5252
set(BUILD_TESTING OFF) # do not build tests of dependencies
5353

54+
boost_fetch(boostorg/static_assert TAG develop EXCLUDE_FROM_ALL)
5455
boost_fetch(boostorg/assert TAG develop EXCLUDE_FROM_ALL) # needed by core
5556
boost_fetch(boostorg/config TAG develop EXCLUDE_FROM_ALL)
5657
boost_fetch(boostorg/core TAG develop EXCLUDE_FROM_ALL)

0 commit comments

Comments
 (0)