Skip to content

Commit

Permalink
Merge pull request #550 from cppalliance/develop
Browse files Browse the repository at this point in the history
Update master for v1.1.0
  • Loading branch information
mborland authored May 13, 2024
2 parents 1922ee9 + 672b569 commit 0ff407a
Show file tree
Hide file tree
Showing 52 changed files with 3,379 additions and 802 deletions.
50 changes: 46 additions & 4 deletions .drone.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -187,16 +187,58 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
),

linux_pipeline(
"Linux 18.04 GCC 7* 32",
"Linux 18.04 GCC 7* 32 03",
"cppalliance/droneubuntu1804:1",
{ TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '03,11,14,17', ADDRMD: '32' },
{ TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '03', ADDRMD: '32' },
"nload",
),

linux_pipeline(
"Linux 18.04 GCC 7* 64",
"Linux 18.04 GCC 7* 32 11",
"cppalliance/droneubuntu1804:1",
{ TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '03,11,14,17', ADDRMD: '64' },
{ TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '11', ADDRMD: '32' },
"nload",
),

linux_pipeline(
"Linux 18.04 GCC 7* 32 14",
"cppalliance/droneubuntu1804:1",
{ TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '14', ADDRMD: '32' },
"nload",
),

linux_pipeline(
"Linux 18.04 GCC 7* 32 17",
"cppalliance/droneubuntu1804:1",
{ TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '17', ADDRMD: '32' },
"nload",
),

linux_pipeline(
"Linux 18.04 GCC 7* 64 03",
"cppalliance/droneubuntu1804:1",
{ TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '03', ADDRMD: '64' },
"nload",
),

linux_pipeline(
"Linux 18.04 GCC 7* 64 11",
"cppalliance/droneubuntu1804:1",
{ TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '11', ADDRMD: '64' },
"nload",
),

linux_pipeline(
"Linux 18.04 GCC 7* 64 14",
"cppalliance/droneubuntu1804:1",
{ TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '14', ADDRMD: '64' },
"nload",
),

linux_pipeline(
"Linux 18.04 GCC 7* 64 17",
"cppalliance/droneubuntu1804:1",
{ TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '17', ADDRMD: '64' },
"nload",
),

Expand Down
47 changes: 47 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -671,3 +671,50 @@ jobs:
run: |
cd ../boost-root/__build__
ctest --output-on-failure --no-tests=error
MSYS2:
defaults:
run:
shell: msys2 {0}
strategy:
fail-fast: false
matrix:
include:
#- { sys: MINGW32, compiler: gcc, cxxstd: '03,11,17,20' }
- { sys: MINGW64, compiler: gcc, cxxstd: '03,11,17,20' }

runs-on: windows-latest

steps:
- uses: actions/checkout@v3

- name: Setup MSYS2 environment
uses: msys2/setup-msys2@v2
with:
msystem: ${{matrix.sys}}
update: true
install: git python
pacboy: gcc:p cmake:p ninja:p

- name: Fetch Boost.CI
uses: actions/checkout@v3
with:
repository: boostorg/boost-ci
ref: master
path: boost-ci-cloned
- name: Get CI scripts folder
run: |
# Copy ci folder if not testing Boost.CI
[[ "$GITHUB_REPOSITORY" =~ "boost-ci" ]] || cp -r boost-ci-cloned/ci .
rm -rf boost-ci-cloned
- name: Setup Boost
env:
B2_COMPILER: ${{matrix.compiler}}
B2_CXXSTD: ${{matrix.cxxstd}}
B2_SANITIZE: ${{matrix.sanitize}}
B2_STDLIB: ${{matrix.stdlib}}
run: ci/github/install.sh

- name: Run tests
run: ci/build.sh
4 changes: 2 additions & 2 deletions .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
standard: [ c++20 ]
compiler: [ g++ ]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: '0'
- name: update-tools
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
make gcov -f make_gcov_01_generic.gmk --jobs=8 MY_ALL_COV=0 MY_BOOST_ROOT=../../../boost-root MY_CC=${{ matrix.compiler }} MY_STD=${{ matrix.standard }}
echo
- name: upload-codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
files: ./test/cover/coverage.info
token: ${{ secrets.CODECOV_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fuzz.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
fi
fi
git config --global pack.threads 0
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install packages
if: matrix.install
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/metal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
run:
shell: bash
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: '0'
- name: update-tools
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tidy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
standard: [ c++14 ]
compiler: [ g++ ]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: '0'
- name: update-tools
Expand Down
Loading

0 comments on commit 0ff407a

Please sign in to comment.