Merge pull request #93 from sdarwin/feature/gha_fix

Small GHA fix, create destination dir
2021-07-27 23:53:44 +03:00 · 2021-07-27 13:35:51 -05:00 · 2021-07-02 20:38:22 +03:00 · 2021-07-02 20:35:45 +03:00 · 2021-07-02 20:34:19 +03:00 · 2021-07-02 20:03:50 +03:00
6 changed files with 101 additions and 31 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,7 +8,12 @@ on:
      - develop
      - feature/**

+concurrency:
+  group: ${{format('{0}:{1}', github.repository, github.ref)}}
+  cancel-in-progress: true
+
 env:
+  GIT_FETCH_JOBS: 8
  UBSAN_OPTIONS: print_stacktrace=1

 jobs:
@@ -42,15 +47,20 @@ jobs:
          - toolset: gcc-8
            cxxstd: "03,11,14,17,2a"
            os: ubuntu-18.04
+            install: g++-8
          - toolset: gcc-9
            cxxstd: "03,11,14,17,2a"
            os: ubuntu-18.04
          - toolset: gcc-10
-            cxxstd: "03,11,14,17,2a"
-            os: ubuntu-18.04
+            cxxstd: "03,11,14,17,20"
+            os: ubuntu-20.04
+          - toolset: gcc-11
+            cxxstd: "03,11,14,17,20"
+            os: ubuntu-20.04
+            install: g++-11
          - toolset: clang
            compiler: clang++-3.5
-            cxxstd: "03,11,14"
+            cxxstd: "03,11"
            os: ubuntu-16.04
            install: clang-3.5
          - toolset: clang
@@ -87,6 +97,7 @@ jobs:
            compiler: clang++-6.0
            cxxstd: "03,11,14,17"
            os: ubuntu-18.04
+            install: clang-6.0
          - toolset: clang
            compiler: clang++-7
            cxxstd: "03,11,14,17"
@@ -95,14 +106,25 @@ jobs:
          - toolset: clang
            compiler: clang++-8
            cxxstd: "03,11,14,17,2a"
-            os: ubuntu-20.04
+            os: ubuntu-18.04
+            install: clang-8
+            gcc_toolchain: 7
          - toolset: clang
            compiler: clang++-9
            cxxstd: "03,11,14,17,2a"
            os: ubuntu-20.04
+            install: clang-9
          - toolset: clang
            compiler: clang++-10
-            cxxstd: "03,11,14,17,2a"
+            cxxstd: "03,11,14,17,20"
+            os: ubuntu-20.04
+          - toolset: clang
+            compiler: clang++-11
+            cxxstd: "03,11,14,17,20"
+            os: ubuntu-20.04
+          - toolset: clang
+            compiler: clang++-12
+            cxxstd: "03,11,14,17,20"
            os: ubuntu-20.04
          - toolset: clang
            cxxstd: "03,11,14,17,2a"
@@ -115,7 +137,21 @@ jobs:

      - name: Install packages
        if: matrix.install
-        run: sudo apt install ${{matrix.install}}
+        run: |
+          sudo apt-get update
+          sudo apt-get install ${{matrix.install}}
+
+      - name: Setup GCC Toolchain
+        if: matrix.gcc_toolchain
+        run: |
+          GCC_TOOLCHAIN_ROOT="$HOME/gcc-toolchain"
+          echo "GCC_TOOLCHAIN_ROOT=\"$GCC_TOOLCHAIN_ROOT\"" >> $GITHUB_ENV
+          MULTIARCH_TRIPLET="$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
+          mkdir -p "$GCC_TOOLCHAIN_ROOT"
+          ln -s /usr/include "$GCC_TOOLCHAIN_ROOT/include"
+          ln -s /usr/bin "$GCC_TOOLCHAIN_ROOT/bin"
+          mkdir -p "$GCC_TOOLCHAIN_ROOT/lib/gcc/$MULTIARCH_TRIPLET"
+          ln -s "/usr/lib/gcc/$MULTIARCH_TRIPLET/${{matrix.gcc_toolchain}}" "$GCC_TOOLCHAIN_ROOT/lib/gcc/$MULTIARCH_TRIPLET/${{matrix.gcc_toolchain}}"

      - name: Setup Boost
        run: |
@@ -133,21 +169,28 @@ jobs:
          cd ..
          git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
          cd boost-root
+          mkdir -p libs/$LIBRARY
          cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
          git submodule update --init tools/boostdep
-          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY
+          python tools/boostdep/depinst/depinst.py --git_args "--jobs $GIT_FETCH_JOBS" $LIBRARY
          ./bootstrap.sh
          ./b2 -d0 headers

      - name: Create user-config.jam
        if: matrix.compiler
        run: |
-          echo "using ${{matrix.toolset}} : : ${{matrix.compiler}} ;" > ~/user-config.jam
+          echo -n "using ${{matrix.toolset}} : : ${{matrix.compiler}}" > ~/user-config.jam
+          if [ -n "$GCC_TOOLCHAIN_ROOT" ]
+          then
+            echo -n " : <compileflags>\"--gcc-toolchain=$GCC_TOOLCHAIN_ROOT\" <linkflags>\"--gcc-toolchain=$GCC_TOOLCHAIN_ROOT\"" >> ~/user-config.jam
+          fi
+          echo " ;" >> ~/user-config.jam

      - name: Run tests
        run: |
+          BUILD_JOBS=$((nproc || sysctl -n hw.ncpu) 2> /dev/null)
          cd ../boost-root
-          ./b2 -j3 libs/$LIBRARY/test toolset=${{matrix.toolset}} cxxstd=${{matrix.cxxstd}} variant=debug,release
+          ./b2 -j $BUILD_JOBS libs/$LIBRARY/test toolset=${{matrix.toolset}} cxxstd=${{matrix.cxxstd}} variant=debug,release

  windows:
    strategy:
@@ -190,7 +233,7 @@ jobs:
          cd boost-root
          xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\
          git submodule update --init tools/boostdep
-          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" %LIBRARY%
+          python tools/boostdep/depinst/depinst.py --git_args "--jobs %GIT_FETCH_JOBS%" %LIBRARY%
          cmd /c bootstrap
          b2 -d0 headers

@@ -198,4 +241,4 @@ jobs:
        shell: cmd
        run: |
          cd ../boost-root
-          b2 -j3 libs/%LIBRARY%/test toolset=${{matrix.toolset}} cxxstd=${{matrix.cxxstd}} address-model=${{matrix.addrmd}} variant=debug,release
+          b2 -j %NUMBER_OF_PROCESSORS% libs/%LIBRARY%/test toolset=${{matrix.toolset}} cxxstd=${{matrix.cxxstd}} address-model=${{matrix.addrmd}} variant=debug,release
--- a/.travis.yml
+++ b/.travis.yml
@@ -149,8 +149,9 @@ matrix:
      env: CMAKE_TEST=1
      script:
        - mkdir __build__ && cd __build__
-        - cmake -DBOOST_ENABLE_CMAKE=1 -DBoost_VERBOSE=1 -DBOOST_INCLUDE_LIBRARIES=core ..
-        - ctest --output-on-failure -R boost_core
+        - cmake -DBUILD_TESTING=ON -DBOOST_INCLUDE_LIBRARIES=core ..
+        - cmake --build . --target tests
+        - ctest --output-on-failure

    - os: linux
      env: CMAKE_SUBDIR_TEST=1
@@ -168,8 +169,9 @@ matrix:
    - os: linux
      env: CMAKE_INSTALL_TEST=1
      script:
+        - pip install --user cmake
        - mkdir __build__ && cd __build__
-        - cmake -DBOOST_ENABLE_CMAKE=1 -DBoost_VERBOSE=1 -DBOOST_INCLUDE_LIBRARIES="assert;config;core" -DCMAKE_INSTALL_PREFIX=~/.local ..
+        - cmake -DBOOST_INCLUDE_LIBRARIES=core -DCMAKE_INSTALL_PREFIX=~/.local ..
        - cmake --build . --target install
        - cd ../libs/core/test/cmake_install_test && mkdir __build__ && cd __build__
        - cmake -DCMAKE_INSTALL_PREFIX=~/.local ..
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,13 +17,6 @@ target_link_libraries(boost_core
    Boost::config
 )

-if(BOOST_SUPERPROJECT_VERSION)
-
-  include(BoostInstall)
-  boost_install(TARGETS boost_core HEADER_DIRECTORY include/)
-
-endif()
-
 if(BUILD_TESTING)

  add_subdirectory(test)
--- a/include/boost/core/ignore_unused.hpp
+++ b/include/boost/core/ignore_unused.hpp
@@ -11,34 +11,64 @@

 namespace boost {

-#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+
+template <typename... Ts>
+BOOST_FORCEINLINE BOOST_CXX14_CONSTEXPR void ignore_unused(Ts&& ...)
+{}
+
+#else

 template <typename... Ts>
 BOOST_FORCEINLINE BOOST_CXX14_CONSTEXPR void ignore_unused(Ts const& ...)
 {}

+#endif
+
 template <typename... Ts>
 BOOST_FORCEINLINE BOOST_CXX14_CONSTEXPR void ignore_unused()
 {}

-#else
+#else // !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+
+template <typename T1>
+BOOST_FORCEINLINE BOOST_CXX14_CONSTEXPR void ignore_unused(T1&)
+{}

 template <typename T1>
 BOOST_FORCEINLINE BOOST_CXX14_CONSTEXPR void ignore_unused(T1 const&)
 {}

+template <typename T1, typename T2>
+BOOST_FORCEINLINE BOOST_CXX14_CONSTEXPR void ignore_unused(T1&, T2&)
+{}
+
 template <typename T1, typename T2>
 BOOST_FORCEINLINE BOOST_CXX14_CONSTEXPR void ignore_unused(T1 const&, T2 const&)
 {}

+template <typename T1, typename T2, typename T3>
+BOOST_FORCEINLINE BOOST_CXX14_CONSTEXPR void ignore_unused(T1&, T2&, T3&)
+{}
+
 template <typename T1, typename T2, typename T3>
 BOOST_FORCEINLINE BOOST_CXX14_CONSTEXPR void ignore_unused(T1 const&, T2 const&, T3 const&)
 {}

+template <typename T1, typename T2, typename T3, typename T4>
+BOOST_FORCEINLINE BOOST_CXX14_CONSTEXPR void ignore_unused(T1&, T2&, T3&, T4&)
+{}
+
 template <typename T1, typename T2, typename T3, typename T4>
 BOOST_FORCEINLINE BOOST_CXX14_CONSTEXPR void ignore_unused(T1 const&, T2 const&, T3 const&, T4 const&)
 {}

+template <typename T1, typename T2, typename T3, typename T4, typename T5>
+BOOST_FORCEINLINE BOOST_CXX14_CONSTEXPR void ignore_unused(T1&, T2&, T3&, T4&, T5&)
+{}
+
 template <typename T1, typename T2, typename T3, typename T4, typename T5>
 BOOST_FORCEINLINE BOOST_CXX14_CONSTEXPR void ignore_unused(T1 const&, T2 const&, T3 const&, T4 const&, T5 const&)
 {}
--- a/include/boost/core/uncaught_exceptions.hpp
+++ b/include/boost/core/uncaught_exceptions.hpp
@@ -26,6 +26,7 @@
 #pragma once
 #endif

+#if (defined(__cpp_lib_uncaught_exceptions) && __cpp_lib_uncaught_exceptions >= 201411)
 #if defined(__APPLE__)
 #include <Availability.h>
 // Apple systems only support std::uncaught_exceptions starting with specific versions:
@@ -34,16 +35,15 @@
 // - tvOS >= 10.0
 // - watchOS >= 3.0
 // https://github.com/boostorg/core/issues/80
-#if (defined(__cpp_lib_uncaught_exceptions) && __cpp_lib_uncaught_exceptions >= 201411) && \
-    ( \
-        (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || \
-        (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) \
-    )
+#if (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || \
+    (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
 #define BOOST_CORE_HAS_UNCAUGHT_EXCEPTIONS
 #endif
+#else
+#define BOOST_CORE_HAS_UNCAUGHT_EXCEPTIONS
+#endif // defined(__APPLE__)
 // Visual Studio 14.0 supports N4152 std::uncaught_exceptions() but doesn't define __cpp_lib_uncaught_exceptions
-#elif (defined(__cpp_lib_uncaught_exceptions) && __cpp_lib_uncaught_exceptions >= 201411) || \
-    (defined(_MSC_VER) && _MSC_VER >= 1900)
+#elif (defined(_MSC_VER) && _MSC_VER >= 1900)
 #define BOOST_CORE_HAS_UNCAUGHT_EXCEPTIONS
 #endif

--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -96,7 +96,9 @@ run lightweight_test_test4.cpp
  : : : $(pedantic-errors) ;
 run lightweight_test_test5.cpp
  : : : $(pedantic-errors)
-    <toolset>gcc-4.4.7:<cxxflags>-Wno-sign-compare ;
+    <toolset>gcc-4.4.7:<cxxflags>-Wno-sign-compare
+    <toolset>gcc-4.4:<cxxflags>-Wno-sign-compare
+  ;
 run lightweight_test_test6.cpp
  : : : $(pedantic-errors) ;
Author	SHA1	Message	Date
Andrey Semashev	f4b3d5dba6	Merge pull request #93 from sdarwin/feature/gha_fix Small GHA fix, create destination dir	2021-07-27 23:53:44 +03:00
sdarwin	9f0b97c80b	Small GHA fix, create destination dir	2021-07-27 13:35:51 -05:00
Andrey Semashev	ce53cc1f8f	Changed quotes in format() expression.	2021-07-02 20:38:22 +03:00
Andrey Semashev	8fad14b804	Use gcc-7 toolchain for clang-8 CI job.	2021-07-02 20:35:45 +03:00
Andrey Semashev	24b6d89e7f	Changed CI concurrency group format. This should fix CI and also make concurrncy work for PRs.	2021-07-02 20:34:19 +03:00
Andrey Semashev	ffd79a28e1	Added concurrency settings to auto-cancel redundant CI jobs.	2021-07-02 20:03:50 +03:00
Andrey Semashev	aa97e418f2	Increased git fetch jobs on Windows and use CPU count for build jobs.	2021-07-02 19:33:06 +03:00
Andrey Semashev	f563d50d42	Use more git fetch jobs to speed up clones.	2021-07-02 19:19:48 +03:00
Andrey Semashev	c55a20dff2	Reverted gcc package removal and instead setup a dummy gcc toolset tree. Removing gcc and libstdc++ packages did not fix the clang-8 test failures. Instead, setup a dummy gcc toolset tree and point clang to it to force the compiler detect and use an older libstdc++.	2021-07-02 19:14:04 +03:00
Andrey Semashev	bc508f8b4c	Remove gcc-10 for clang-8 testing. This is another attempt to make clang-8 tests not fail in C++20 mode. Remove gcc-10 and libstdc++-10 to prevent clang using it. Also, use apt-get instead of apt since the former is recommended to use in scripts. This should silence apt warnings.	2021-07-02 16:15:59 +03:00
Andrey Semashev	03c5481dd4	Moved clang-8 to Bionic and gcc-10,11 to Focal. clang-8 jobs fail in C++20 mode since it doesn't support std::is_constant_evaluated, which is called from libstdc++-10 that is installed in Focal image. Moving it back to Bionic should work around the issue as it should use an older libstdc++ version. gcc-10 and 11 were moved to Focal just to make this configuration tested. Also, changed 2a to 20 for compilers that support this.	2021-07-02 11:52:44 +03:00
Andrey Semashev	8e7ee90080	Merge pull request #92 from evanmiller/develop Restore support for ancient Mac OS	2021-07-02 01:59:50 +03:00
Evan Miller	128d9314d6	Restore support for ancient Mac OS Mac OS 10.4 and earlier lack Availability.h, causing compilation to fail. Rearrange the macro logic to include Availability.h only if we already think there may be support for uncaught exceptions.	2021-07-01 16:32:40 -04:00
Peter Dimov	012d96a72b	Use non-const references in non-variadic branch as well	2021-06-10 10:09:46 +03:00
Peter Dimov	27d700ec01	Use non-const references in ignore_unused to avoid g++-11 warning	2021-06-10 09:54:51 +03:00
Peter Dimov	507c182f4c	Revert "Initialize variables in ignore_unused_test to avoid a g++-11 warning" This reverts commit `1a011cde56`.	2021-06-10 09:40:08 +03:00
Peter Dimov	1a011cde56	Initialize variables in ignore_unused_test to avoid a g++-11 warning	2021-06-10 08:25:28 +03:00
Peter Dimov	71c3d320d5	Update ci.yml	2021-06-10 07:20:24 +03:00
Peter Dimov	b3fa7ca565	Take care of gcc-4.4 in addition to gcc-4.4.7	2021-06-10 04:58:17 +03:00
Peter Dimov	d3aa4a2f12	Update .travis.yml	2021-06-10 04:56:26 +03:00
Peter Dimov	67107dbaf9	Update ci.yml	2021-06-10 04:22:36 +03:00
Peter Dimov	0b74f0d394	Update CMakeLists.txt	2021-06-10 02:03:10 +03:00
Peter Dimov	e53393357f	Update .github/workflows	2021-04-19 18:11:37 +03:00
Peter Dimov	7daee1d41b	Add -DBUILD_TESTING=ON to .yml files; it's not default anymore	2021-03-19 03:53:31 +02:00