forked from boostorg/geometry
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[ci] Update circleCI image and add missing tests
- Loading branch information
Showing
2 changed files
with
69 additions
and
5 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 |
---|---|---|
|
@@ -4,6 +4,10 @@ | |
# Copyright (c) 2018 Mateusz Loskot <[email protected]> | ||
# Copyright (c) 2018-2021 Adam Wulkiewicz, Lodz, Poland | ||
# | ||
# This file was modified by Oracle on 2023. | ||
# Modifications copyright (c) 2023 Oracle and/or its affiliates. | ||
# Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle | ||
# | ||
# 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) | ||
|
@@ -19,8 +23,8 @@ environment: &environment | |
# Docker image | ||
docker: &docker | ||
docker: | ||
# gcc-6.0, ruby-2.3, sudo, curl | ||
- image: circleci/ruby:2.3 | ||
# gcc-9.3, ruby-2.3, sudo, curl | ||
- image: cimg/base:stable-20.04 | ||
|
||
# Build configuration | ||
config: &config | ||
|
@@ -60,7 +64,7 @@ jobs: | |
git submodule update --init tools/build | ||
git submodule update --init libs/config | ||
git submodule update --init tools/boostdep | ||
python tools/boostdep/depinst/depinst.py geometry -I index/test | ||
python3 tools/boostdep/depinst/depinst.py geometry -I index/test | ||
./bootstrap.sh | ||
./b2 headers | ||
- run: mkdir $COVERAGE_DIR | ||
|
@@ -94,6 +98,24 @@ jobs: | |
root: ~/project | ||
paths: | ||
- shared-coverage/algorithms_buffer | ||
algorithms_closest_points: | ||
<<: *config | ||
steps: | ||
- *attach_workspace | ||
- run: ./$BOOST_DIR/libs/geometry/.circleci/run_test.sh algorithms_closest_points test/algorithms/closest_points 1 | ||
- persist_to_workspace: | ||
root: ~/project | ||
paths: | ||
- shared-coverage/algorithms_closest_points | ||
algorithms_convex_hull: | ||
<<: *config | ||
steps: | ||
- *attach_workspace | ||
- run: ./$BOOST_DIR/libs/geometry/.circleci/run_test.sh algorithms_convex_hull test/algorithms/convex_hull | ||
- persist_to_workspace: | ||
root: ~/project | ||
paths: | ||
- shared-coverage/algorithms_convex_hull | ||
algorithms_covered_by: | ||
<<: *config | ||
steps: | ||
|
@@ -331,6 +353,15 @@ jobs: | |
root: ~/project | ||
paths: | ||
- shared-coverage/policies | ||
robustness: | ||
<<: *config | ||
steps: | ||
- *attach_workspace | ||
- run: ./$BOOST_DIR/libs/geometry/.circleci/run_test.sh robustness test/robustness | ||
- persist_to_workspace: | ||
root: ~/project | ||
paths: | ||
- shared-coverage/robustness | ||
srs: | ||
<<: *config | ||
steps: | ||
|
@@ -416,12 +447,22 @@ jobs: | |
root: ~/project | ||
paths: | ||
- shared-coverage/index_detail | ||
remaining_tests: | ||
<<: *config | ||
steps: | ||
- *attach_workspace | ||
- run: ./$BOOST_DIR/libs/geometry/.circleci/run_test.sh | ||
- persist_to_workspace: | ||
root: ~/project | ||
paths: | ||
- shared-coverage/remaining_tests | ||
|
||
coverage: | ||
<<: *config | ||
steps: | ||
- *attach_workspace | ||
- run: ls -lah $COVERAGE_DIR | ||
- run: sudo apt-get update | ||
- run: sudo apt-get install lcov | ||
- run: lcov --directory $COVERAGE_DIR --base-directory $BOOST_DIR --capture --output-file $COVERAGE_DIR/coverage.info | ||
- run: lcov --extract $COVERAGE_DIR/coverage.info "*/boost/geometry/*" "*/libs/geometry/include/*" --output-file $COVERAGE_DIR/coverage.info | ||
|
@@ -462,6 +503,7 @@ requires_2: &requires_2 | |
- io | ||
- iterators | ||
- policies | ||
- robustness | ||
- strategies | ||
- views | ||
|
||
|
@@ -470,6 +512,8 @@ requires_3: &requires_3 | |
- algorithms | ||
- algorithms_area | ||
- algorithms_buffer | ||
- algorithms_closest_points | ||
- algorithms_convex_hull | ||
- algorithms_covered_by | ||
- algorithms_crosses | ||
- algorithms_disjoint | ||
|
@@ -497,6 +541,10 @@ requires_4: &requires_4 | |
- index_detail | ||
- cs_undefined | ||
|
||
requires_5: &requires_5 | ||
requires: | ||
- remaining_tests | ||
|
||
only_master_develop: &only_master_develop | ||
filters: | ||
branches: | ||
|
@@ -550,6 +598,9 @@ workflows: | |
- policies: | ||
<<: *requires_1 | ||
<<: *only_master_develop | ||
- robustness: | ||
<<: *requires_1 | ||
<<: *only_master_develop | ||
- strategies: | ||
<<: *requires_1 | ||
<<: *only_master_develop | ||
|
@@ -566,6 +617,12 @@ workflows: | |
- algorithms_buffer: | ||
<<: *requires_2 | ||
<<: *only_master_develop | ||
- algorithms_closest_points: | ||
<<: *requires_2 | ||
<<: *only_master_develop | ||
- algorithms_convex_hull: | ||
<<: *requires_2 | ||
<<: *only_master_develop | ||
- algorithms_covered_by: | ||
<<: *requires_2 | ||
<<: *only_master_develop | ||
|
@@ -636,10 +693,17 @@ workflows: | |
- cs_undefined: | ||
<<: *requires_3 | ||
<<: *only_master_develop | ||
# master, develop: level 5, coverage | ||
# master, develop: level 5, closing job | ||
- remaining_tests: | ||
<<: *requires_4 | ||
<<: *only_master_develop | ||
- coverage: | ||
<<: *requires_4 | ||
<<: *only_master_develop | ||
# master, develop: level 6, coverage | ||
- coverage: | ||
<<: *requires_5 | ||
<<: *only_master_develop | ||
|
||
# other branches: level 1, minimal | ||
- minimal: | ||
|
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