Skip to content

Tidy up and simplify GitHub Actions YAML #62

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.

Sign up for GitHub

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
mloskot merged 3 commits into from
Mar 18, 2020
Merged

Tidy up and simplify GitHub Actions YAML #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51cd7e1
GA: Tidy up
mloskot Mar 18, 2020
929e97e
Revert superfluous BOOST_SUPERPROJECT_VERSION handling
mloskot Mar 18, 2020
0ae44de
Remove step id as no longer used
mloskot Mar 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions .github/workflows/cmake-find-boost-install.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,13 @@ jobs:
sudo ./b2 install variant=release --with-system

- name: CMake
run: |
cmake -B "$GITHUB_WORKSPACE/build" -DCMAKE_VERBOSE_MAKEFILE=ON -DBOOST_JSON_FIND_BOOST=ON
run: cmake -B _build -DCMAKE_VERBOSE_MAKEFILE=ON -DBOOST_JSON_FIND_BOOST=ON

- name: Build
run: |
cmake --build "$GITHUB_WORKSPACE/build" --config Release
run: cmake --build _build --config Release

- name: Test
run: |
cd "$GITHUB_WORKSPACE/build"
ctest --build-config Release --output-on-failure
working-directory: _build
run: ctest --build-config Release --output-on-failure


11 changes: 4 additions & 7 deletions .github/workflows/cmake-standalone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,11 @@ jobs:
git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1

- name: CMake
run: |
cmake -B "$GITHUB_WORKSPACE/build" -DCMAKE_VERBOSE_MAKEFILE=ON -DBOOST_JSON_STANDALONE=ON
run: cmake -B _build -DCMAKE_VERBOSE_MAKEFILE=ON -DBOOST_JSON_STANDALONE=ON

- name: Build
run: |
cmake --build "$GITHUB_WORKSPACE/build" --config Release
run: cmake --build _build --config Release

- name: Test
run: |
cd "$GITHUB_WORKSPACE/build"
ctest --build-config Release --output-on-failure
working-directory: _build
run: ctest --build-config Release --output-on-failure
26 changes: 10 additions & 16 deletions .github/workflows/cmake-with-boost-stage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Set up environment
id: setenv
run: |
if [[ "$GITHUB_REF" == *master ]]; then
echo "::set-env name=BOOST_BRANCH::master"
Expand All @@ -25,8 +24,6 @@ jobs:
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: |
Expand All @@ -45,39 +42,36 @@ jobs:

- uses: actions/checkout@v2
with:
path: ${{ steps.setenv.outputs.boost_root }}/libs/${{ steps.setenv.outputs.boost_self }}
path: ${{ env.BOOST_ROOT }}/libs/${{ env.BOOST_SELF }}

- name: Checkout submodules
shell: bash
working-directory: '${{ env.BOOST_ROOT }}/libs/${{ env.BOOST_SELF }}'
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
working-directory: '${{ env.BOOST_ROOT }}'
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
working-directory: '${{ env.BOOST_ROOT }}'
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
working-directory: '${{ env.BOOST_ROOT }}/libs/${{ env.BOOST_SELF }}'
run: cmake -B _build -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_VERBOSE_MAKEFILE=ON

- name: Build
run: |
export VER
cmake --build "$GITHUB_WORKSPACE/build" --config Release
working-directory: '${{ env.BOOST_ROOT }}/libs/${{ env.BOOST_SELF }}'
run: cmake --build _build --config Release

- name: Test
run: |
cd "$GITHUB_WORKSPACE/build"
ctest --build-config Release --output-on-failure
working-directory: '${{ env.BOOST_ROOT }}/libs/${{ env.BOOST_SELF }}'
run: ctest --build-config Release --output-on-failure
6 changes: 1 addition & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,7 @@ if(BOOST_SUPERPROJECT_VERSION)
set(BOOST_JSON_VERSION ${BOOST_SUPERPROJECT_VERSION})
endif()

if (BOOST_SUPERPROJECT_VERSION)
project(boost_json VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX)
else()
project(boost_json VERSION "${BOOST_JSON_VERSION}" LANGUAGES CXX)
endif()
project(boost_json VERSION "${BOOST_JSON_VERSION}" LANGUAGES CXX)

file(GLOB_RECURSE BOOST_JSON_HEADERS CONFIGURE_DEPENDS
include/boost/*.hpp
Expand Down