Skip to content

Commit 2952382

Browse files
committed
Update CI to 2024.12 spec, update README
1 parent f2622bf commit 2952382

File tree

3 files changed

+34
-29
lines changed

3 files changed

+34
-29
lines changed

.appveyor.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@ branches:
3333
- /fix\/.*/
3434
- /pr\/.*/
3535

36+
skip_commits:
37+
files:
38+
- LICENSE
39+
- meta/*
40+
- README.md
41+
3642
matrix:
3743
fast_finish: false
3844
# Adding MAYFAIL to any matrix job allows it to fail but the build stays green:

.github/workflows/ci.yml

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright 2020-2021 Peter Dimov
22
# Copyright 2021 Andrey Semashev
33
# Copyright 2021 Alexander Grund
4-
# Copyright 2022 James E. King III
4+
# Copyright 2022-2025 James E. King III
55
#
66
# Distributed under the Boost Software License, Version 1.0.
77
# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
@@ -18,20 +18,24 @@ on:
1818
- feature/**
1919
- fix/**
2020
- pr/**
21+
paths-ignore:
22+
- LICENSE
23+
- meta/**
24+
- README.md
2125

2226
concurrency:
2327
group: ${{format('{0}:{1}', github.repository, github.ref)}}
2428
cancel-in-progress: true
2529

2630
env:
31+
# test_bug_6701 (nice to scope this down)
2732
ASAN_OPTIONS: allocator_may_return_null=1
2833
GIT_FETCH_JOBS: 8
2934
NET_RETRY_COUNT: 5
3035
B2_CI_VERSION: 1
3136
B2_VARIANT: debug,release
3237
B2_LINK: shared,static
3338
LCOV_BRANCH_COVERAGE: 1
34-
CODECOV_NAME: Github Actions
3539

3640
jobs:
3741
posix:
@@ -132,7 +136,7 @@ jobs:
132136
for i in {1..${NET_RETRY_COUNT:-3}}; do sudo -E add-apt-repository -y ppa:git-core/ppa && break || sleep 10; done
133137
apt-get -o Acquire::Retries=$NET_RETRY_COUNT update
134138
osver=$(lsb_release -sr | cut -f1 -d.)
135-
pkgs="g++ git"
139+
pkgs="g++ git xz-utils"
136140
# Ubuntu 22+ has only Python 3 in the repos
137141
if [ -n "$osver" ] && [ "$osver" -ge "22" ]; then
138142
pkgs+=" python-is-python3 libpython3-dev"
@@ -145,6 +149,9 @@ jobs:
145149
if [[ "${{ matrix.ccache }}" == "no" ]]; then
146150
echo "B2_USE_CCACHE=0" >> $GITHUB_ENV
147151
fi
152+
if [[ "${{ matrix.sanitize }}" == "yes" ]]; then
153+
echo "LSAN_OPTIONS=suppressions=${GITHUB_WORKSPACE}/test/suppressions.txt" >> $GITHUB_ENV
154+
fi
148155
git config --global pack.threads 0
149156
if [[ "${{matrix.container}}" == "ubuntu:1"* ]]; then
150157
# Node 20 doesn't work with Ubuntu 16/18 glibc: https://github.com/actions/checkout/issues/1590
@@ -180,8 +187,8 @@ jobs:
180187
- name: Install packages
181188
if: startsWith(matrix.os, 'ubuntu')
182189
run: |
183-
SOURCE_KEYS=(${{join(matrix.source_keys, ' ')}})
184-
SOURCES=(${{join(matrix.sources, ' ')}})
190+
SOURCE_KEYS=("${{join(matrix.source_keys, '" "')}}")
191+
SOURCES=("${{join(matrix.sources, '" "')}}")
185192
# Add this by default
186193
SOURCE_KEYS+=('http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x1E9377A2BA9EF27F')
187194
SOURCES+=(ppa:ubuntu-toolchain-r/test)
@@ -247,21 +254,11 @@ jobs:
247254
if: '!matrix.coverity'
248255
run: ci/build.sh
249256

250-
- name: Collect coverage
257+
- name: Upload coverage
251258
if: matrix.coverage
252259
run: ci/codecov.sh "upload"
253260
env:
254-
BOOST_CI_CODECOV_IO_UPLOAD: skip
255-
256-
- name: Upload coverage
257-
if: matrix.coverage
258-
uses: codecov/codecov-action@v4
259-
with:
260-
disable_search: true
261-
file: coverage.info
262-
name: Github Actions
263-
token: ${{secrets.CODECOV_TOKEN}}
264-
verbose: true
261+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
265262

266263
- name: Run coverity
267264
if: matrix.coverity && github.event_name == 'push' && (github.ref_name == 'develop' || github.ref_name == 'master')
@@ -325,11 +322,12 @@ jobs:
325322

326323
- name: Upload coverage
327324
if: matrix.coverage
328-
uses: codecov/codecov-action@v4
325+
uses: codecov/codecov-action@v5
329326
with:
330327
disable_search: true
331-
file: __out/cobertura.xml
332-
name: Github Actions
328+
fail_ci_if_error: true
329+
files: __out/cobertura.xml
330+
name: github-actions
333331
token: ${{secrets.CODECOV_TOKEN}}
334332
verbose: true
335333

README.md

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
Pool, part of collection of the [Boost C++ Libraries](http://github.com/boostorg), provides an efficient way to handle memory suballocation for fixed-size items.
1+
Pool, part of collection of the [Boost C++ Libraries](https://github.com/boostorg), provides an efficient way to handle memory suballocation for fixed-size items.
22

33
### License
44

5-
Distributed under the [Boost Software License, Version 1.0](http://www.boost.org/LICENSE_1_0.txt).
5+
Distributed under the [Boost Software License, Version 1.0](https://www.boost.org/LICENSE_1_0.txt).
66

77
### Properties
88

@@ -11,10 +11,11 @@ Distributed under the [Boost Software License, Version 1.0](http://www.boost.org
1111

1212
### Build Status
1313

14-
Branch | GHA CI | Appveyor | Coverity Scan | codecov.io | Deps | Docs | Tests |
15-
:-------------: | ------ | -------- | ------------- | ---------- | ---- | ---- | ----- |
16-
[`master`](https://github.com/boostorg/pool/tree/master) | [![Build Status](https://github.com/boostorg/pool/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/boostorg/pool/actions?query=branch:master) | [![Build status](https://ci.appveyor.com/api/projects/status/j6otdvyec8ycs9h1?svg=true)](https://ci.appveyor.com/project/cppalliance/pool) | [![Coverity Scan Build Status](https://scan.coverity.com/projects/15800/badge.svg)](https://scan.coverity.com/projects/boostorg-pool) | [![codecov](https://codecov.io/gh/boostorg/pool/branch/master/graph/badge.svg)](https://codecov.io/gh/boostorg/pool/branch/master)| [![Deps](https://img.shields.io/badge/deps-master-brightgreen.svg)](https://pdimov.github.io/boostdep-report/master/pool.html) | [![Documentation](https://img.shields.io/badge/docs-master-brightgreen.svg)](https://www.boost.org/doc/libs/master/libs/pool) | [![Enter the Matrix](https://img.shields.io/badge/matrix-master-brightgreen.svg)](http://www.boost.org/development/tests/master/developer/pool.html)
17-
[`develop`](https://github.com/boostorg/pool/tree/develop) | [![Build Status](https://github.com/boostorg/pool/actions/workflows/ci.yml/badge.svg?branch=develop)](https://github.com/boostorg/pool/actions?query=branch:develop) | [![Build status](https://ci.appveyor.com/api/projects/status/j6otdvyec8ycs9h1/branch/develop?svg=true)](https://ci.appveyor.com/project/cppalliance/pool/branch/develop) | [![Coverity Scan Build Status](https://scan.coverity.com/projects/15800/badge.svg)](https://scan.coverity.com/projects/boostorg-pool) | [![codecov](https://codecov.io/gh/boostorg/pool/branch/develop/graph/badge.svg)](https://codecov.io/gh/boostorg/pool/branch/develop) | [![Deps](https://img.shields.io/badge/deps-develop-brightgreen.svg)](https://pdimov.github.io/boostdep-report/develop/pool.html) | [![Documentation](https://img.shields.io/badge/docs-develop-brightgreen.svg)](https://www.boost.org/doc/libs/develop/libs/pool) | [![Enter the Matrix](https://img.shields.io/badge/matrix-develop-brightgreen.svg)](http://www.boost.org/development/tests/develop/developer/pool.html)
14+
<!-- boost-ci/tools/makebadges.sh --project pool --appveyor j6otdvyec8ycs9h1 --codecov blmk8CZxg2 --coverity 15800 -->
15+
| Branch | GHA CI | Appveyor | Coverity Scan | codecov.io | Deps | Docs | Tests |
16+
| :-------------: | ------ | -------- | ------------- | ---------- | ---- | ---- | ----- |
17+
| [`master`](https://github.com/boostorg/pool/tree/master) | [![Build Status](https://github.com/boostorg/pool/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/boostorg/pool/actions?query=branch:master) | [![Build status](https://ci.appveyor.com/api/projects/status/j6otdvyec8ycs9h1/branch/master?svg=true)](https://ci.appveyor.com/project/cppalliance/pool/branch/master) | [![Coverity Scan Build Status](https://scan.coverity.com/projects/15800/badge.svg)](https://scan.coverity.com/projects/boostorg-pool) | [![codecov](https://codecov.io/gh/boostorg/pool/branch/master/graph/badge.svg?token=blmk8CZxg2)](https://codecov.io/gh/boostorg/pool/tree/master) | [![Deps](https://img.shields.io/badge/deps-master-brightgreen.svg)](https://pdimov.github.io/boostdep-report/master/pool.html) | [![Documentation](https://img.shields.io/badge/docs-master-brightgreen.svg)](https://www.boost.org/doc/libs/master/libs/pool) | [![Enter the Matrix](https://img.shields.io/badge/matrix-master-brightgreen.svg)](https://www.boost.org/development/tests/master/developer/pool.html)
18+
| [`develop`](https://github.com/boostorg/pool/tree/develop) | [![Build Status](https://github.com/boostorg/pool/actions/workflows/ci.yml/badge.svg?branch=develop)](https://github.com/boostorg/pool/actions?query=branch:develop) | [![Build status](https://ci.appveyor.com/api/projects/status/j6otdvyec8ycs9h1/branch/develop?svg=true)](https://ci.appveyor.com/project/cppalliance/pool/branch/develop) | [![Coverity Scan Build Status](https://scan.coverity.com/projects/15800/badge.svg)](https://scan.coverity.com/projects/boostorg-pool) | [![codecov](https://codecov.io/gh/boostorg/pool/branch/develop/graph/badge.svg?token=blmk8CZxg2)](https://codecov.io/gh/boostorg/pool/tree/develop) | [![Deps](https://img.shields.io/badge/deps-develop-brightgreen.svg)](https://pdimov.github.io/boostdep-report/develop/pool.html) | [![Documentation](https://img.shields.io/badge/docs-develop-brightgreen.svg)](https://www.boost.org/doc/libs/develop/libs/pool) | [![Enter the Matrix](https://img.shields.io/badge/matrix-develop-brightgreen.svg)](https://www.boost.org/development/tests/develop/developer/pool.html)
1819

1920
### Directories
2021

@@ -27,8 +28,8 @@ Branch | GHA CI | Appveyor | Coverity Scan | codecov.io | Deps | Docs |
2728

2829
### More information
2930

30-
* [Ask questions](http://stackoverflow.com/questions/ask?tags=c%2B%2B,boost,boost-pool)
31+
* [Ask questions](https://stackoverflow.com/questions/ask?tags=c%2B%2B,boost,boost-pool)
3132
* [Report bugs](https://github.com/boostorg/pool/issues): Be sure to mention Boost version, platform and compiler you're using. A small compilable code sample to reproduce the problem is always good as well.
32-
* Submit your patches as pull requests against **develop** branch. Note that by submitting patches you agree to license your modifications under the [Boost Software License, Version 1.0](http://www.boost.org/LICENSE_1_0.txt).
33-
* Discussions about the library are held on the [Boost developers mailing list](http://www.boost.org/community/groups.html#main). Be sure to read the [discussion policy](http://www.boost.org/community/policy.html) before posting and add the `[pool]` tag at the beginning of the subject line.
33+
* Submit your patches as pull requests against **develop** branch. Note that by submitting patches you agree to license your modifications under the [Boost Software License, Version 1.0](https://www.boost.org/LICENSE_1_0.txt).
34+
* Discussions about the library are held on the [Boost developers mailing list](https://www.boost.org/community/groups.html#main). Be sure to read the [discussion policy](https://www.boost.org/community/policy.html) before posting and add the `[pool]` tag at the beginning of the subject line.
3435

0 commit comments

Comments
 (0)