Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
Preparing for release with Boost 1.86

Ref #748
  • Loading branch information
mloskot committed Jul 7, 2024
2 parents 8994c2f + 67f021a commit 201f31c
Show file tree
Hide file tree
Showing 31 changed files with 369 additions and 300 deletions.
71 changes: 0 additions & 71 deletions .azure-pipelines.yml

This file was deleted.

9 changes: 0 additions & 9 deletions .ci/azure-pipelines/steps-check-cmake.yml

This file was deleted.

51 changes: 0 additions & 51 deletions .ci/azure-pipelines/steps-cmake-build-and-test.yml

This file was deleted.

41 changes: 0 additions & 41 deletions .ci/azure-pipelines/steps-install-boost.yml

This file was deleted.

17 changes: 0 additions & 17 deletions .ci/azure-pipelines/steps-install-conan.yml

This file was deleted.

18 changes: 0 additions & 18 deletions .ci/azure-pipelines/steps-install-gcc.yml

This file was deleted.

48 changes: 31 additions & 17 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on:
env:
LIBRARY: gil
UBSAN_OPTIONS: print_stacktrace=1
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true

jobs:
posix:
Expand All @@ -20,46 +21,52 @@ jobs:
include:
- toolset: gcc-6
cxxstd: "14,1z"
os: ubuntu-18.04
os: ubuntu-latest
container: ubuntu:18.04
install: g++-6
- toolset: gcc-7
cxxstd: "14,17"
os: ubuntu-18.04
- toolset: gcc
compiler: g++-8
install: g++-7
os: ubuntu-20.04
- toolset: gcc-8
cxxstd: "14"
os: ubuntu-18.04
os: ubuntu-20.04
install: g++-8
- toolset: gcc-9
cxxstd: "14,17"
os: ubuntu-18.04
os: ubuntu-20.04
install: g++-9
- toolset: gcc-10
cxxstd: "14,17"
os: ubuntu-18.04
os: ubuntu-20.04
install: g++-10
- toolset: clang
compiler: clang++-3.9
cxxstd: "14"
os: ubuntu-18.04
os: ubuntu-latest
container: ubuntu:18.04
install: clang-3.9
- toolset: clang
compiler: clang++-4.0
cxxstd: "14"
os: ubuntu-18.04
os: ubuntu-latest
container: ubuntu:18.04
install: clang-4.0
- toolset: clang
compiler: clang++-5.0
cxxstd: "14,1z"
os: ubuntu-18.04
os: ubuntu-latest
container: ubuntu:18.04
install: clang-5.0
- toolset: clang
compiler: clang++-6.0
cxxstd: "14,17"
os: ubuntu-18.04
os: ubuntu-20.04
install: clang-6.0
- toolset: clang
compiler: clang++-7
cxxstd: "14,17"
os: ubuntu-18.04
os: ubuntu-20.04
install: clang-7
- toolset: clang
compiler: clang++-8
Expand All @@ -77,16 +84,23 @@ jobs:
os: ubuntu-20.04
- toolset: clang
cxxstd: "14,17"
os: macos-10.15
os: macos-12

runs-on: ${{matrix.os}}
container: ${{matrix.container}}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Setup container environment
if: matrix.container
run: |
apt-get -y update
apt-get -y install sudo python3 git g++
- name: Install packages
if: matrix.install
run: sudo apt install ${{matrix.install}}
run: sudo apt-get -y install ${{matrix.install}}

- name: Setup Boost
run: |
Expand All @@ -97,7 +111,7 @@ jobs:
cd boost-root
cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
git submodule update --init tools/boostdep
python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY
python3 tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY
./bootstrap.sh
./b2 -d0 headers
Expand Down Expand Up @@ -140,7 +154,7 @@ jobs:
runs-on: ${{matrix.os}}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup Boost
shell: cmd
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ jobs:
coverage:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: install packages
run: |
sudo apt update
sudo apt install g++ libpng-dev libjpeg-dev libtiff5-dev libraw-dev lcov python -y
sudo apt install g++ libpng-dev libjpeg-dev libtiff5-dev libraw-dev lcov python-is-python3 -y
- name: Setup Boost
run: |
Expand Down Expand Up @@ -52,4 +52,3 @@ jobs:
uses: codecov/[email protected]
with:
files: ../boost-root/coverage.info

2 changes: 1 addition & 1 deletion .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
build-docs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: ./.github/actions/docs-prerequisites
- uses: ./.github/actions/setup-boost
- uses: ./.github/actions/generate-doc
Expand Down
Loading

0 comments on commit 201f31c

Please sign in to comment.