-
Notifications
You must be signed in to change notification settings - Fork 107
Updates #60
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Updates #60
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
4dc3cb1
Update badges
vinniefalco f009232
Update CMakeLists.txt comments to clarify supported build scenarios
mloskot 11e7252
Ignore additional CMake build directories (e.g. _build32, _build64)
mloskot bbfb09b
CMake project version depends on BOOST_SUPERPROJECT_VERSION
mloskot 7eefbd8
Always build tests if BUILD_TESTING=ON
mloskot 831cab9
Add GitHub Actions for three of all supported build scenarios
mloskot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| ############################################################################## | ||
| # GitHub Actions Workflow for Boost.Json | ||
| # | ||
| # Copyright (c) 2020 Mateusz Loskot <[email protected]> | ||
| # | ||
| # Use, modification and distribution is subject to the Boost Software License, | ||
| # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at | ||
| # http://www.boost.org/LICENSE_1_0.txt) | ||
| ############################################################################## | ||
| name: cmake-find-boost-install | ||
|
|
||
| on: [push, pull_request] | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
|
|
||
| - name: Checkout submodules | ||
| shell: bash | ||
| run: | | ||
| auth_header="$(git config --local --get http.https://github.com/.extraheader)" | ||
| git submodule sync --recursive | ||
| git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1 | ||
| - name: Uninstall Boost | ||
| run: | | ||
| sudo apt-get remove -y -q --purge libboost-all-dev libboost-doc libboost-tools-dev | ||
| sudo apt-get autoremove -y -q | ||
| sudo apt-get autoclean -y -q | ||
| - name: Install Boost | ||
| run: | | ||
| git clone -b master --depth 1 https://github.com/boostorg/boost.git "$GITHUB_WORKSPACE/boost-root" | ||
| cd "$GITHUB_WORKSPACE/boost-root" | ||
| git submodule update -q --init libs/headers | ||
| git submodule update -q --init libs/system | ||
| git submodule update -q --init libs/utility | ||
| git submodule update -q --init tools/boost_install | ||
| git submodule update -q --init tools/boostdep | ||
| git submodule update -q --init tools/build | ||
| python tools/boostdep/depinst/depinst.py system | ||
| python tools/boostdep/depinst/depinst.py utility | ||
| ./bootstrap.sh | ||
| sudo ./b2 install variant=release --with-system | ||
| - name: CMake | ||
| run: | | ||
| cmake -B "$GITHUB_WORKSPACE/build" -DCMAKE_VERBOSE_MAKEFILE=ON -DBOOST_JSON_FIND_BOOST=ON | ||
| - name: Build | ||
| run: | | ||
| cmake --build "$GITHUB_WORKSPACE/build" --config Release | ||
| - name: Test | ||
| run: | | ||
| cd "$GITHUB_WORKSPACE/build" | ||
| ctest --build-config Release --output-on-failure | ||
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| ############################################################################## | ||
| # GitHub Actions Workflow for Boost.Json | ||
| # | ||
| # Copyright (c) 2020 Mateusz Loskot <[email protected]> | ||
| # | ||
| # Use, modification and distribution is subject to the Boost Software License, | ||
| # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at | ||
| # http://www.boost.org/LICENSE_1_0.txt) | ||
| ############################################################################## | ||
| name: cmake-standalone | ||
|
|
||
| on: [push, pull_request] | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Uninstall Boost | ||
| run: | | ||
| sudo apt-get remove -y -q --purge libboost-all-dev libboost-doc libboost-tools-dev | ||
| sudo apt-get autoremove -y -q | ||
| sudo apt-get autoclean -y -q | ||
|
|
||
| - uses: actions/checkout@v2 | ||
|
|
||
| - name: CMake | ||
| run: | | ||
| cmake -B "$GITHUB_WORKSPACE/build" -DCMAKE_VERBOSE_MAKEFILE=ON -DBOOST_JSON_STANDALONE=ON | ||
|
|
||
| - name: Build | ||
| run: | | ||
| cmake --build "$GITHUB_WORKSPACE/build" --config Release | ||
|
|
||
| - name: Test | ||
| run: | | ||
| cd "$GITHUB_WORKSPACE/build" | ||
| ctest --build-config Release --output-on-failure |
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| ############################################################################## | ||
| # GitHub Actions Workflow for Boost.Json | ||
| # | ||
| # Copyright (c) 2020 Mateusz Loskot <[email protected]> | ||
| # | ||
| # Use, modification and distribution is subject to the Boost Software License, | ||
| # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at | ||
| # http://www.boost.org/LICENSE_1_0.txt) | ||
| ############################################################################## | ||
| name: cmake-with-boost-stage | ||
|
|
||
| on: [push, pull_request] | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Set up environment | ||
| id: setenv | ||
| run: | | ||
| if [[ "$GITHUB_REF" == *master ]]; then | ||
| echo "::set-env name=BOOST_BRANCH::master" | ||
| else | ||
| echo "::set-env name=BOOST_BRANCH::develop" | ||
| fi | ||
| echo "::set-env name=BOOST_SELF::$(basename $GITHUB_WORKSPACE)" | ||
| echo "::set-env name=BOOST_ROOT::$GITHUB_WORKSPACE/boost-root" | ||
| echo "::set-output name=boost_self::$(basename $GITHUB_WORKSPACE)" | ||
| echo "::set-output name=boost_root::$GITHUB_WORKSPACE/boost-root" | ||
| - name: Uninstall Boost | ||
| run: | | ||
| sudo apt-get remove -y -q --purge libboost-all-dev libboost-doc libboost-tools-dev | ||
| sudo apt-get autoremove -y -q | ||
| sudo apt-get autoclean -y -q | ||
| - name: Clone Boost | ||
| run: | | ||
| git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git $BOOST_ROOT | ||
| cd $BOOST_ROOT | ||
| git submodule update -q --init libs/headers | ||
| git submodule update -q --init tools/boost_install | ||
| git submodule update -q --init tools/boostdep | ||
| git submodule update -q --init tools/build | ||
| - uses: actions/checkout@v2 | ||
| with: | ||
| path: ${{ steps.setenv.outputs.boost_root }}/libs/${{ steps.setenv.outputs.boost_self }} | ||
mloskot marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| - name: Checkout submodules | ||
| shell: bash | ||
| run: | | ||
| cd "$BOOST_ROOT/libs/$BOOST_SELF" | ||
| auth_header="$(git config --local --get http.https://github.com/.extraheader)" | ||
| git submodule sync --recursive | ||
| git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1 | ||
| - name: Run tools/boostdep/depinst/depinst.py | ||
| run: | | ||
| cd $BOOST_ROOT | ||
| python tools/boostdep/depinst/depinst.py --include bench --include benchmark --include example --include examples --include tools $BOOST_SELF | ||
| - name: Bootstrap Boost | ||
| run: | | ||
| cd $BOOST_ROOT | ||
| ./bootstrap.sh | ||
| ./b2 headers | ||
| ./b2 variant=release --no-cmake-config --with-system stage | ||
| - name: CMake | ||
| run: | | ||
| cd "$BOOST_ROOT/libs/$BOOST_SELF" | ||
| cmake -B "$GITHUB_WORKSPACE/build" -DCMAKE_VERBOSE_MAKEFILE=ON | ||
| - name: Build | ||
| run: | | ||
| export VER | ||
| cmake --build "$GITHUB_WORKSPACE/build" --config Release | ||
| - name: Test | ||
| run: | | ||
| cd "$GITHUB_WORKSPACE/build" | ||
| ctest --build-config Release --output-on-failure | ||
This file contains hidden or 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,6 @@ | ||
| /bin | ||
| /bin64 | ||
| /_build* | ||
| temp | ||
|
|
||
| # Emacs | ||
|
|
||
This file contains hidden or 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 hidden or 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.