diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c1889aad..b16917d1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,6 +80,11 @@ jobs: os: ubuntu-24.04 install: g++-13 supported: true + - toolset: gcc-14 + cxxstd: "11,14,17,20,2b" + os: ubuntu-24.04 + install: g++-14 + supported: true # clang 3.5 not supported # It can't compile the websocket stream code - toolset: clang diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml index 267b62d0..c491cd26 100644 --- a/.github/workflows/fuzz.yml +++ b/.github/workflows/fuzz.yml @@ -11,7 +11,6 @@ concurrency: group: ${{format('{0}:{1}:{2}', github.repository, github.workflow, github.ref)}} cancel-in-progress: true - jobs: fuzz: runs-on: ubuntu-24.04 @@ -41,9 +40,7 @@ jobs: cd boost-root cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY git submodule update --init tools/boostdep - python3 tools/boostdep/depinst/depinst.py $LIBRARY - ./bootstrap.sh - ./b2 + python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY - name: Fuzz corpus uses: actions/cache@v3.3.1 @@ -58,13 +55,11 @@ jobs: - name: Run fuzzer run: | cd ../boost-root/libs/beast - mkdir build - cd build + mkdir __build__ && cd __build__ cmake \ -DCMAKE_CXX_COMPILER=clang++ \ -DCMAKE_C_COMPILER=clang \ -DBOOST_BEAST_BUILD_EXAMPLES=OFF \ - -DBOOST_BEAST_BUILD_TESTS=ON \ -DBOOST_BEAST_BUILD_FUZZERS=ON \ -DBOOST_BEAST_FUZZER_CORPUS_PATH=${{ github.workspace }}/corpus.tar .. make boost_beast_fuzz_all diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 02b39c4a..ead37666 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -86,6 +86,6 @@ add_subdirectory(bench) add_subdirectory(doc) add_subdirectory(example) -if (BOOST_BEAST_BUILD_FUZZERS AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang") +if (BOOST_BEAST_BUILD_FUZZERS) add_subdirectory(fuzz) endif ()