Merge branch 'master' into develop

boostorg · Jun 28, 2021 · 7156392 · 7156392
2 parents 9970590 + 561ccb8
commit 7156392
Showing 1 changed file with 56 additions and 57 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,19 +20,19 @@ jobs:
       fail-fast: false
       matrix:
         include:
-# - name: "B2_TOOLSET=gcc-4.8 B2_CXXSTD=03,11 BOOST_DATE Job 0"
-#   buildtype: "boost"
-#   packages: "g++-4.8"
-#   packages_to_remove: ""
-#   os: "ubuntu-16.04"
-#   container: "ubuntu:14.04"
-#   cxx: "g++-4.8"
-#   sources: ""
-#   llvm_os: ""
-#   llvm_ver: ""
-#   b2_toolset: "gcc-4.8"
-#   b2_cxxstd: "03,11"
-#   boost_date_time_test_without_self_contained_header_tests: "1"
+          - name: "B2_TOOLSET=gcc-4.8 B2_CXXSTD=03,11 BOOST_DATE Job 0"
+            buildtype: "boost"
+            packages: "g++-4.8"
+            packages_to_remove: ""
+            os: "ubuntu-16.04"
+            container: "ubuntu:14.04"
+            cxx: "g++-4.8"
+            sources: ""
+            llvm_os: ""
+            llvm_ver: ""
+            b2_toolset: "gcc-4.8"
+            b2_cxxstd: "03,11"
+            boost_date_time_test_without_self_contained_header_tests: "1"
           - name: "B2_TOOLSET=gcc-4.9 B2_CXXSTD=03,11 BOOST_DATE Job 1"
             buildtype: "boost"
             packages: "g++-4.9"
@@ -72,7 +72,7 @@ jobs:
             buildtype: "boost"
             packages: "g++-7"
             packages_to_remove: ""
-            os: "ubuntu-20.04"
+            os: "ubuntu-16.04"
             cxx: "g++-7"
             sources: ""
             llvm_os: ""
@@ -84,7 +84,7 @@ jobs:
             buildtype: "boost"
             packages: "g++-8"
             packages_to_remove: ""
-            os: "ubuntu-20.04"
+            os: "ubuntu-16.04"
             cxx: "g++-8"
             sources: ""
             llvm_os: ""
@@ -96,27 +96,28 @@ jobs:
             buildtype: "boost"
             packages: "g++-9"
             packages_to_remove: ""
-            os: "ubuntu-20.04"
+            os: "ubuntu-16.04"
             cxx: "g++-9"
             sources: ""
             llvm_os: ""
             llvm_ver: ""
             b2_toolset: "gcc-9"
             b2_cxxstd: "17,2a"
             boost_date_time_test_without_self_contained_header_tests: "1"
-          - name: "B2_TOOLSET=gcc-10 B2_CXXSTD=17,2a BOOST_DATE_T Job 7"
+          - name: "B2_TOOLSET=clang-3.8 B2_CXXSTD=03,11 BOOST_DA Job 7"
             buildtype: "boost"
-            packages: "g++-9"
+            packages: "clang-3.8 libstdc++-6-dev"
             packages_to_remove: ""
-            os: "ubuntu-20.04"
-            cxx: "g++-9"
+            os: "ubuntu-16.04"
+            container: "ubuntu:14.04"
+            cxx: "clang++-3.8"
             sources: ""
-            llvm_os: ""
-            llvm_ver: ""
-            b2_toolset: "gcc-9"
-            b2_cxxstd: "17,2a"
+            llvm_os: "xenial"
+            llvm_ver: "3.8"
+            b2_toolset: "clang-3.8"
+            b2_cxxstd: "03,11"
             boost_date_time_test_without_self_contained_header_tests: "1"
-          - name: "B2_TOOLSET=clang-4.0 B2_CXXSTD=11,14 BOOST_DA Job 9"
+          - name: "B2_TOOLSET=clang-4.0 B2_CXXSTD=11,14 BOOST_DA Job 8"
             buildtype: "boost"
             packages: "clang-4.0 libstdc++-6-dev"
             packages_to_remove: ""
@@ -128,7 +129,7 @@ jobs:
             b2_toolset: "clang-4.0"
             b2_cxxstd: "11,14"
             boost_date_time_test_without_self_contained_header_tests: "1"
-          - name: "B2_TOOLSET=clang-5.0 B2_CXXSTD=11,14 BOOST_DA Job 10"
+          - name: "B2_TOOLSET=clang-5.0 B2_CXXSTD=11,14 BOOST_DA Job 9"
             buildtype: "boost"
             packages: "clang-5.0 libstdc++-7-dev"
             packages_to_remove: ""
@@ -140,61 +141,59 @@ jobs:
             b2_toolset: "clang-5.0"
             b2_cxxstd: "11,14"
             boost_date_time_test_without_self_contained_header_tests: "1"
-#          - name: "B2_TOOLSET=clang-6.0 B2_CXXSTD=14,17 BOOST_DA Job 11"
-#            buildtype: "boost"
-#            packages: "clang-6.0 libc6-dbg libc++-dev libstdc++-8-dev"
-#            packages_to_remove: ""
-#            os: "ubuntu-20.04"
-#            cxx: "clang++-6.0"
-#            sources: ""
-#            llvm_os: "xenial"
-#            llvm_ver: "6.0"
-#            b2_toolset: "clang-6.0"
-#            b2_cxxstd: "14,17"
-#            boost_date_time_test_without_self_contained_header_tests: "1"
-          - name: "B2_TOOLSET=clang-7 B2_CXXSTD=17 BOOST_DATE Job 12"
+          - name: "B2_TOOLSET=clang-6.0 B2_CXXSTD=14,17 BOOST_DA Job 10"
+            buildtype: "boost"
+            packages: "clang-6.0 libc6-dbg libc++-dev libstdc++-8-dev"
+            packages_to_remove: ""
+            os: "ubuntu-16.04"
+            cxx: "clang++-6.0"
+            sources: ""
+            llvm_os: "xenial"
+            llvm_ver: "6.0"
+            b2_toolset: "clang-6.0"
+            b2_cxxstd: "14,17"
+            boost_date_time_test_without_self_contained_header_tests: "1"
+          - name: "B2_TOOLSET=clang-7 B2_CXXSTD=17,2a BOOST_DATE Job 11"
             buildtype: "boost"
-#            packages: "clang-7 libc6-dbg libc++-dev libstdc++-8-dev"
-            packages: "clang-7"
+            packages: "clang-7 libc6-dbg libc++-dev libstdc++-8-dev"
             packages_to_remove: ""
-            os: "ubuntu-18.04"
+            os: "ubuntu-16.04"
             cxx: "clang++-7"
             sources: ""
             llvm_os: "xenial"
             llvm_ver: "7"
             b2_toolset: "clang-7"
-            b2_cxxstd: "17"
+            b2_cxxstd: "17,2a"
             boost_date_time_test_without_self_contained_header_tests: "1"
-          - name: "B2_TOOLSET=clang-8 B2_CXXSTD=17 BOOST_DATE Job 13"
+          - name: "B2_TOOLSET=clang-8 B2_CXXSTD=17,2a BOOST_DATE Job 12"
             buildtype: "boost"
-#            packages: "clang-8 libc6-dbg libc++-dev libstdc++-8-dev"
-            packages: "clang-8"
+            packages: "clang-8 libc6-dbg libc++-dev libstdc++-8-dev"
             packages_to_remove: ""
-            os: "ubuntu-18.04"
+            os: "ubuntu-16.04"
             cxx: "clang++-8"
             sources: ""
             llvm_os: "xenial"
             llvm_ver: "8"
             b2_toolset: "clang-8"
-            b2_cxxstd: "17"
+            b2_cxxstd: "17,2a"
             boost_date_time_test_without_self_contained_header_tests: "1"
-          - name: "B2_TOOLSET=clang-6.0 B2_CXXSTD=03,11,14,17 Job 14"
+          - name: "B2_TOOLSET=clang-6.0 B2_CXXSTD=03,11,14 Job 13"
             buildtype: "boost"
             packages: "clang-6.0 libc6-dbg libc++-dev libstdc++-8-dev"
             packages_to_remove: ""
-            os: "ubuntu-18.04"
+            os: "ubuntu-16.04"
             cxx: "clang++-6.0"
             sources: ""
             llvm_os: "xenial"
             llvm_ver: "6.0"
             b2_toolset: "clang-6.0"
-            b2_cxxstd: "03,11,14,17"
+            b2_cxxstd: "03,11,14"
             b2_cxxflags: "-stdlib=libc++"
           - name: "COMMENT=codecov.io B2_CXXSTD=03,11 B2_TOOLSET Job 15"
             buildtype: "b5847f804b-0fcaf592f9"
             packages: "g++-8"
             packages_to_remove: ""
-            os: "ubuntu-20.04"
+            os: "ubuntu-16.04"
             cxx: "g++-8"
             sources: ""
             llvm_os: ""
@@ -208,7 +207,7 @@ jobs:
             buildtype: "boost"
             packages: "g++-8"
             packages_to_remove: ""
-            os: "ubuntu-20.04"
+            os: "ubuntu-16.04"
             cxx: "g++-8"
             sources: ""
             llvm_os: ""
@@ -224,7 +223,7 @@ jobs:
             buildtype: "boost"
             packages: "g++-8"
             packages_to_remove: ""
-            os: "ubuntu-20.04"
+            os: "ubuntu-16.04"
             cxx: "g++-8"
             sources: ""
             llvm_os: ""
@@ -241,7 +240,7 @@ jobs:
 #             buildtype: "boost"
 #             packages: "g++-8"
 #             packages_to_remove: ""
-#             os: "ubuntu-20.04"
+#             os: "ubuntu-16.04"
 #             cxx: "g++-8"
 #             sources: ""
 #             llvm_os: ""
@@ -259,7 +258,7 @@ jobs:
             buildtype: "b5847f804b-db180b7bd2"
             packages: "clang-6.0 libc6-dbg libc++-dev libstdc++-8-dev"
             packages_to_remove: ""
-            os: "ubuntu-18.04"
+            os: "ubuntu-16.04"
             cxx: "clang++-6.0"
             sources: ""
             llvm_os: "xenial"
@@ -276,7 +275,7 @@ jobs:
             buildtype: "b5847f804b-cce9827eb5"
             packages: "binutils-gold gdb libc6-dbg"
             packages_to_remove: ""
-            os: "ubuntu-20.04"
+            os: "ubuntu-16.04"
             cxx: "g++"
             sources: ""
             llvm_os: ""