Skip to content

Commit

Permalink
Sync from upstream.
Browse files Browse the repository at this point in the history
  • Loading branch information
grafikrobot committed Aug 17, 2024
2 parents ffd385e + a896dfc commit ab91fbf
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 24 deletions.
56 changes: 34 additions & 22 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@ jobs:
os: ubuntu-latest
container: ubuntu:23.04
install: g++-13
- toolset: gcc-14
cxxstd: "03,11,14,17,20,2b"
os: ubuntu-latest
container: ubuntu:24.04
install: g++-14
- toolset: clang
compiler: clang++-3.9
cxxstd: "03,11,14"
Expand Down Expand Up @@ -145,8 +150,11 @@ jobs:
container: ubuntu:23.10
install: clang-17
- toolset: clang
cxxstd: "03,11,14,17,2a"
os: macos-11
compiler: clang++-18
cxxstd: "03,11,14,17,20,2b"
os: ubuntu-latest
container: ubuntu:24.04
install: clang-18
- toolset: clang
cxxstd: "03,11,14,17,20,2b"
os: macos-12
Expand All @@ -165,6 +173,10 @@ jobs:
shell: bash

steps:
- name: Enable Node 16
run: |
echo "ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true" >> $GITHUB_ENV
- uses: actions/checkout@v3

- name: Setup container environment
Expand Down Expand Up @@ -237,7 +249,7 @@ jobs:
runs-on: ${{matrix.os}}

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

- name: Setup Boost
shell: cmd
Expand Down Expand Up @@ -274,14 +286,14 @@ jobs:
include:
- os: ubuntu-20.04
- os: ubuntu-22.04
- os: macos-11
- os: macos-12
- os: macos-13
- os: macos-14

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

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

- name: Install packages
if: matrix.install
Expand Down Expand Up @@ -322,14 +334,14 @@ jobs:
include:
- os: ubuntu-20.04
- os: ubuntu-22.04
- os: macos-11
- os: macos-12
- os: macos-13
- os: macos-14

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

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

- name: Install packages
if: matrix.install
Expand Down Expand Up @@ -380,14 +392,14 @@ jobs:
include:
- os: ubuntu-20.04
- os: ubuntu-22.04
- os: macos-11
- os: macos-12
- os: macos-13
- os: macos-14

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

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

- name: Install packages
if: matrix.install
Expand Down Expand Up @@ -436,14 +448,14 @@ jobs:
include:
- os: ubuntu-20.04
- os: ubuntu-22.04
- os: macos-11
- os: macos-12
- os: macos-13
- os: macos-14

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

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

- name: Install packages
if: matrix.install
Expand All @@ -464,14 +476,14 @@ jobs:
include:
- os: ubuntu-20.04
- os: ubuntu-22.04
- os: macos-11
- os: macos-12
- os: macos-13
- os: macos-14

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

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

- name: Install packages
if: matrix.install
Expand Down Expand Up @@ -501,14 +513,14 @@ jobs:
include:
- os: ubuntu-20.04
- os: ubuntu-22.04
- os: macos-11
- os: macos-12
- os: macos-13
- os: macos-14

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

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

- name: Install packages
if: matrix.install
Expand All @@ -533,8 +545,8 @@ jobs:
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v3
- uses: Jimver/[email protected].10
- uses: actions/checkout@v4
- uses: Jimver/[email protected].16
with:
cuda: '11.7.1'
linux-local-args: '["--toolkit"]'
Expand Down Expand Up @@ -568,8 +580,8 @@ jobs:
runs-on: windows-2019

steps:
- uses: actions/checkout@v3
- uses: Jimver/[email protected].10
- uses: actions/checkout@v4
- uses: Jimver/[email protected].16
- uses: ilammy/msvc-dev-cmd@v1

- name: Setup Boost
Expand Down Expand Up @@ -599,7 +611,7 @@ jobs:
runs-on: ${{matrix.os}}

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

- name: Setup Boost
shell: cmd
Expand Down Expand Up @@ -648,7 +660,7 @@ jobs:
runs-on: ${{matrix.os}}

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

- name: Setup Boost
shell: cmd
Expand Down Expand Up @@ -715,7 +727,7 @@ jobs:
runs-on: ${{matrix.os}}

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

- name: Setup Boost
shell: cmd
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

cmake_minimum_required(VERSION 3.5...3.16)

project(boost_mp11 VERSION 1.86.0 LANGUAGES CXX)
project(boost_mp11 VERSION 1.87.0 LANGUAGES CXX)

add_library(boost_mp11 INTERFACE)
add_library(Boost::mp11 ALIAS boost_mp11)
Expand Down
2 changes: 1 addition & 1 deletion include/boost/mp11/version.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
// Same format as BOOST_VERSION:
// major * 100000 + minor * 100 + patch

#define BOOST_MP11_VERSION 108600
#define BOOST_MP11_VERSION 108700

#endif // #ifndef BOOST_MP11_VERSION_HPP_INCLUDED

0 comments on commit ab91fbf

Please sign in to comment.