From eba915ae1e69722db28f0f4e654c036dc99362b4 Mon Sep 17 00:00:00 2001 From: Matt Borland Date: Sun, 4 Jul 2021 12:35:59 -0500 Subject: [PATCH] Add GCC11 to CI (#654) * Add GCC11 to CI * Change std::views to std::ranges::views * Remove g++5 and clang-5. Remove testing of ranges in GCC11 --- .github/workflows/ci.yml | 8 ++++---- test/test_hyperexponential_dist.cpp | 7 +++++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c4831831e..9a6ad5599 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - compiler: [ g++-9, g++-10, clang++-10 ] + compiler: [ g++-9, g++-10, g++-11, clang++-10 ] standard: [ c++11, c++14, c++17, c++2a ] suite: [ float128_tests, special_fun, distribution_tests, misc, quadrature, mp, interpolators, autodiff, ../example//examples, ../tools ] steps: @@ -47,7 +47,7 @@ jobs: if: steps.retry1.outcome=='failure' run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test" - name: Install packages - run: sudo apt install g++-9 g++-10 clang-9 clang-10 libgmp-dev libmpfr-dev libfftw3-dev + run: sudo apt install g++-9 g++-10 g++-11 clang-9 clang-10 libgmp-dev libmpfr-dev libfftw3-dev - name: Checkout main boost run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root - name: Update tools/boostdep @@ -82,7 +82,7 @@ jobs: strategy: fail-fast: false matrix: - compiler: [ g++-5, g++-6, clang++-5.0, clang++-6.0, g++-7, g++-8, clang++-7, clang++-8 ] + compiler: [ g++-6, clang++-6.0, g++-7, g++-8, clang++-7, clang++-8 ] standard: [ c++11, c++14, c++17 ] suite: [ float128_tests, special_fun, distribution_tests, misc, quadrature, mp, interpolators, autodiff, ../example//examples, ../tools ] steps: @@ -111,7 +111,7 @@ jobs: if: steps.retry1.outcome=='failure' run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test" - name: Install packages - run: sudo apt install g++-5 g++-6 g++-7 g++-8 clang-5.0 clang-6.0 clang-7 clang-8 libgmp-dev libmpfr-dev libfftw3-dev + run: sudo apt install g++-6 g++-7 g++-8 clang-6.0 clang-7 clang-8 libgmp-dev libmpfr-dev libfftw3-dev - name: Checkout main boost run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root - name: Update tools/boostdep diff --git a/test/test_hyperexponential_dist.cpp b/test/test_hyperexponential_dist.cpp index 13843a3bf..1f6562c4d 100644 --- a/test/test_hyperexponential_dist.cpp +++ b/test/test_hyperexponential_dist.cpp @@ -389,6 +389,8 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(error_cases, RealT, test_types) // Test C++20 ranges (Currently only GCC10 has full support to P0896R4) #if (__cplusplus > 202000L || _MSVC_LANG > 202000L) && __has_include() && __GNUC__ >= 10 + // Support for ranges is broken using gcc 11.1 + #if __GNUC__ != 11 #include #include @@ -396,9 +398,10 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(error_cases, RealT, test_types) std::array rates_array {1,2,3}; BOOST_MATH_CHECK_THROW(dist_t(std::ranges::begin(probs_array), std::ranges::end(probs_array), std::ranges::begin(rates_array), std::ranges::end(rates_array)), std::domain_error); - const auto probs_range = probs_array | std::views::all; - const auto rates_range = rates_array | std::views::all; + const auto probs_range = probs_array | std::ranges::views::all; + const auto rates_range = rates_array | std::ranges::views::all; BOOST_MATH_CHECK_THROW(dist_t(probs_range, rates_range), std::domain_error); #endif + #endif }