-
Notifications
You must be signed in to change notification settings - Fork 92
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #193 from Stiffstream/0.7-dev-add-boost-build-to-ci
Add boost build to ci
- Loading branch information
Showing
8 changed files
with
121 additions
and
41 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,7 +5,7 @@ name: CI | |
|
|
||
| on: | ||
| push: | ||
| branches: ["master"] | ||
| branches: ["master", "0.7-dev"] | ||
| pull_request: | ||
|
|
||
| jobs: | ||
|
|
@@ -63,6 +63,7 @@ jobs: | |
| cmake \ | ||
| --build $RESTINIO_BUILD_DIR \ | ||
| --config ${{ matrix.build_type }} \ | ||
| --parallel ${NUMBER_OF_PROCESSORS} \ | ||
| --verbose | ||
| - name: Test | ||
| shell: bash | ||
|
|
@@ -77,76 +78,137 @@ jobs: | |
| Build-Linux: | ||
| # The type of runner that the job will run on | ||
| name: Ubuntu-22.04 (${{ matrix.compiler.cname }}, ${{ matrix.build_type }}, C++${{ matrix.compiler.cppstd }}) | ||
| name: Ubuntu-22.04 (${{ matrix.build_settings.toolset }}-${{ matrix.build_settings.toolset_version }}, ${{ matrix.build_type }}, C++${{ matrix.build_settings.cppstd }}, ${{matrix.build_settings.asio_source}} asio) | ||
| runs-on: ubuntu-22.04 | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| compiler: | ||
| - cname: gcc-9 | ||
| cxxname: g++-9 | ||
| ar: gcc-ar-9 | ||
| build_settings: | ||
| - toolset: gcc | ||
| toolset_version: 9 | ||
| cppstd: 17 | ||
| asio_source: standalone | ||
|
|
||
| - cname: gcc-12 | ||
| cxxname: g++-12 | ||
| ar: gcc-ar-12 | ||
| - toolset: gcc | ||
| toolset_version: 9 | ||
| cppstd: 17 | ||
| - cname: gcc-12 | ||
| cxxname: g++-12 | ||
| ar: gcc-ar-12 | ||
| asio_source: boost | ||
|
|
||
| - toolset: gcc | ||
| toolset_version: 9 | ||
| cppstd: 17 | ||
| asio_source: boost-system-package | ||
|
|
||
| - toolset: gcc | ||
| toolset_version: 12 | ||
| cppstd: 17 | ||
| asio_source: standalone | ||
| - toolset: gcc | ||
| toolset_version: 12 | ||
| cppstd: 20 | ||
| asio_source: standalone | ||
| - toolset: gcc | ||
| toolset_version: 12 | ||
| cppstd: 20 | ||
| asio_source: boost | ||
|
|
||
| - cname: clang-13 | ||
| cxxname: clang++-13 | ||
| ar: llvm-ar-13 | ||
| - toolset: clang | ||
| toolset_version: 13 | ||
| cppstd: 17 | ||
| asio_source: standalone | ||
|
|
||
| - cname: clang-15 | ||
| cxxname: clang++-15 | ||
| ar: llvm-ar-15 | ||
| - toolset: clang | ||
| toolset_version: 15 | ||
| cppstd: 17 | ||
| - cname: clang-15 | ||
| cxxname: clang++-15 | ||
| ar: llvm-ar-15 | ||
| asio_source: standalone | ||
| - toolset: clang | ||
| toolset_version: 15 | ||
| cppstd: 20 | ||
| asio_source: standalone | ||
|
|
||
| build_type: | ||
| - Release | ||
| - Debug | ||
| env: | ||
| CC: ${{ matrix.compiler.cname }} | ||
| CXX: ${{ matrix.compiler.cxxname }} | ||
| AR: ${{ matrix.compiler.ar }} | ||
| RESTINIO_BUILD_DIR: _build_${{ matrix.compiler.cname }}_cpp${{ matrix.compiler.cppstd }}_${{ matrix.build_type }} | ||
| RESTINIO_BUILD_TAG: ${{ matrix.build_settings.toolset }}-${{ matrix.build_settings.toolset_version }}_cpp${{ matrix.build_settings.cppstd }}_${{ matrix.build_type }}_${{matrix.build_settings.asio_source}}_asio | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
|
|
||
| - name: Print env | ||
| - name: Prepare env | ||
| run: | | ||
| echo github.event.action: ${{ github.event.action }} | ||
| echo github.event_name: ${{ github.event_name }} | ||
| echo "RESTINIO_BUILD_DIR=_build_${RESTINIO_BUILD_TAG}" >> $GITHUB_ENV | ||
| echo "CC=${{ matrix.build_settings.toolset }}-${{ matrix.build_settings.toolset_version }}" >> $GITHUB_ENV | ||
| if [ "${{ matrix.build_settings.toolset }}" == "gcc" ]; then | ||
| echo "CXX=g++-${{ matrix.build_settings.toolset_version }}" >> $GITHUB_ENV | ||
| echo "AR=gcc-ar-${{ matrix.build_settings.toolset_version }}" >> $GITHUB_ENV | ||
| else | ||
| echo "CXX=clang++-${{ matrix.build_settings.toolset_version }}" >> $GITHUB_ENV | ||
| echo "AR=llvm-ar-${{ matrix.build_settings.toolset_version }}" >> $GITHUB_ENV | ||
| fi | ||
| - name: Install dependencies | ||
| run: | | ||
| sudo gem install Mxx_ru | ||
| if [ "${{ matrix.build_settings.asio_source }}" == "boost-system-package" ]; then | ||
| sudo apt-get update && sudo apt-get install -y libboost-all-dev | ||
| fi | ||
| mxxruexternals | ||
| - name: Configure | ||
| if: ${{ matrix.build_settings.asio_source == 'standalone' }} | ||
| shell: bash | ||
| run: | | ||
| cd dev | ||
| cmake \ | ||
| -B ${RESTINIO_BUILD_DIR} \ | ||
| -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \ | ||
| -DRESTINIO_EXPLICIT_CPPSTD=${{ matrix.build_settings.cppstd }} \ | ||
| -DRESTINIO_TEST_SUFFIX=" [${RESTINIO_BUILD_TAG}]" | ||
| - name: Obtain Boost | ||
| if: ${{ matrix.build_settings.asio_source == 'boost' }} | ||
| uses: MarkusJx/[email protected] | ||
| id: install-boost | ||
| with: | ||
| boost_version: 1.83.0 | ||
| boost_install_dir: ${{github.workspace}}/local_boost | ||
| toolset: ${{ matrix.build_settings.toolset }} | ||
| platform_version: 22.04 | ||
|
|
||
| - name: Configure | ||
| if: ${{ matrix.build_settings.asio_source == 'boost' }} | ||
| shell: bash | ||
| run: | | ||
| mxxruexternals | ||
| cd dev | ||
| cmake \ | ||
| -B ${RESTINIO_BUILD_DIR} \ | ||
| -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \ | ||
| -DRESTINIO_EXPLICIT_CPPSTD=${{ matrix.compiler.cppstd }} \ | ||
| -DRESTINIO_TEST_SUFFIX=" [${{ matrix.compiler.cname }}_cpp${{ matrix.compiler.cppstd }}_${{ matrix.build_type }}]" | ||
| -DRESTINIO_EXPLICIT_CPPSTD=${{ matrix.build_settings.cppstd }} \ | ||
| -DRESTINIO_ASIO_SOURCE=boost \ | ||
| -DBOOST_ROOT=${{ steps.install-boost.outputs.BOOST_ROOT }} \ | ||
| -DRESTINIO_TEST_SUFFIX=" [${RESTINIO_BUILD_TAG}]" | ||
| - name: Configure | ||
| if: ${{ matrix.build_settings.asio_source == 'boost-system-package' }} | ||
| shell: bash | ||
| run: | | ||
| cd dev | ||
| cmake \ | ||
| -B ${RESTINIO_BUILD_DIR} \ | ||
| -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \ | ||
| -DRESTINIO_EXPLICIT_CPPSTD=${{ matrix.build_settings.cppstd }} \ | ||
| -DRESTINIO_ASIO_SOURCE=boost \ | ||
| -DRESTINIO_TEST_SUFFIX=" [${RESTINIO_BUILD_TAG}]" | ||
| - name: Build | ||
| working-directory: ./dev | ||
| shell: bash | ||
| run: | | ||
| cmake \ | ||
| --build $RESTINIO_BUILD_DIR \ | ||
| --parallel $(nproc) \ | ||
| --verbose | ||
| - name: Test | ||
| shell: bash | ||
|
|
@@ -202,6 +264,7 @@ jobs: | |
| run: | | ||
| cmake \ | ||
| --build $RESTINIO_BUILD_DIR \ | ||
| --parallel $(sysctl -n hw.ncpu) \ | ||
| --verbose | ||
| - name: Test | ||
| shell: bash | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| set(UNITTEST _unit.test.router.express_router_boost_regex) | ||
| include(${CMAKE_SOURCE_DIR}/cmake/unittest.cmake) | ||
|
|
||
| TARGET_INCLUDE_DIRECTORIES(${UNITTEST} PRIVATE ${Boost_INCLUDE_DIRS}) | ||
| TARGET_LINK_LIBRARIES(${UNITTEST} PRIVATE ${Boost_REGEX_LIBRARY}) | ||
| TARGET_LINK_LIBRARIES(${UNITTEST} PRIVATE Boost::regex) | ||
|
|
3 changes: 1 addition & 2 deletions
3
dev/test/router/express_router_boost_regex_bench/CMakeLists.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| set(TEST_BENCH _test.router.express_router_boost_regex_bench) | ||
| include(${CMAKE_SOURCE_DIR}/cmake/testbench.cmake) | ||
|
|
||
| TARGET_INCLUDE_DIRECTORIES(${TEST_BENCH} PRIVATE ${Boost_INCLUDE_DIRS}) | ||
| TARGET_LINK_LIBRARIES(${TEST_BENCH} PRIVATE ${Boost_REGEX_LIBRARY}) | ||
| TARGET_LINK_LIBRARIES(${TEST_BENCH} PRIVATE Boost::regex) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters