Skip to content

Commit cc58816

Browse files
committed
Update GHA CI
1 parent 718992b commit cc58816

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

.github/workflows/build.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -213,15 +213,15 @@ jobs:
213213
supported: true
214214
# macos
215215
- toolset: clang
216-
os: macos-12
216+
os: macos-13
217217
cxxstd: "11,14,17,20,2b"
218218
supported: true
219219
- toolset: clang
220-
os: macos-13
220+
os: macos-14
221221
cxxstd: "11,14,17,20,2b"
222222
supported: true
223223
- toolset: clang
224-
os: macos-14
224+
os: macos-15
225225
cxxstd: "11,14,17,20,2b"
226226
supported: true
227227

@@ -231,8 +231,8 @@ jobs:
231231
image: ${{ matrix.container }}
232232
volumes:
233233
- /node20217:/node20217:rw,rshared
234-
- /node20217:/__e/node20:ro,rshared
235-
234+
- ${{ startsWith(matrix.container, 'ubuntu:1') && '/node20217:/__e/node20:ro,rshared' || ' ' }}
235+
236236
steps:
237237
- name: Setup container environment
238238
if: matrix.container != ''
@@ -251,7 +251,7 @@ jobs:
251251
sudo /usr/local/bin/pip install cmake
252252
253253
- name: Install nodejs20glibc2.17
254-
if: matrix.container == 'ubuntu:16.04' || matrix.container == 'ubuntu:18.04'
254+
if: ${{ startsWith( matrix.container, 'ubuntu:1' ) }}
255255
run: |
256256
curl -LO https://archives.boost.io/misc/node/node-v20.9.0-linux-x64-glibc-217.tar.xz
257257
tar -xf node-v20.9.0-linux-x64-glibc-217.tar.xz --strip-components 1 -C /node20217
@@ -605,7 +605,7 @@ jobs:
605605
- name: Use the installed library
606606
run: |
607607
cd ../boost-root/libs/$LIBRARY/test/cmake_test && mkdir __build__ && cd __build__
608-
cmake -DCMAKE_INSTALL_PREFIX=~/.local ..
608+
cmake -DCMAKE_INSTALL_PREFIX=~/.local -DBOOST_CI_INSTALL_TEST=ON ..
609609
cmake --build .
610610
ctest --output-on-failure --no-tests=error
611611
@@ -771,7 +771,7 @@ jobs:
771771
shell: cmd
772772
run: |
773773
cd ../boost-root/libs/%LIBRARY%/test/cmake_test && mkdir __build__ && cd __build__
774-
cmake -DCMAKE_INSTALL_PREFIX=C:/cmake-prefix -DCMAKE_TOOLCHAIN_FILE="../../../cmake/toolchains/msvc.cmake" ..
774+
cmake -DCMAKE_INSTALL_PREFIX=C:/cmake-prefix -DBOOST_CI_INSTALL_TEST=ON -DCMAKE_TOOLCHAIN_FILE="../../../cmake/toolchains/msvc.cmake" ..
775775
cmake --build . --config Debug
776776
ctest --output-on-failure --no-tests=error -C Debug
777777

.github/workflows/fuzz.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ jobs:
6060
-DCMAKE_CXX_COMPILER=clang++ \
6161
-DCMAKE_C_COMPILER=clang \
6262
-DBOOST_BEAST_BUILD_EXAMPLES=OFF \
63+
-DBOOST_BEAST_BUILD_TESTS=ON \
6364
-DBOOST_BEAST_BUILD_FUZZERS=ON \
6465
-DBOOST_BEAST_FUZZER_CORPUS_PATH=${{ github.workspace }}/corpus.tar ..
65-
make boost_beast_fuzz_all
66+
cmake --build . --target boost_beast_fuzz_all

test/cmake_test/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#
2-
# Copyright (c) 2023 Christian Mazakas
32
# Copyright (c) 2022 alandefreitas (alandefreitas@gmail.com)
3+
# Copyright (c) 2023 Christian Mazakas
4+
# Copyright (c) 2024 Mohammad Nejati
45
#
56
# Distributed under the Boost Software License, Version 1.0.
67
# https://www.boost.org/LICENSE_1_0.txt
@@ -18,7 +19,7 @@ else()
1819
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
1920
add_subdirectory(../.. boostorg/beast)
2021

21-
set(BOOST_URL_BUILD_TESTS OFF CACHE BOOL "" FORCE)
22+
set(BOOST_BEAST_BUILD_TESTS OFF CACHE BOOL "" FORCE)
2223

2324
set(deps
2425
# Primary dependencies

0 commit comments

Comments
 (0)