From c5c01b675c7c1f874e1169329f7640ac12bad2fb Mon Sep 17 00:00:00 2001
From: jzmaddock <john@johnmaddock.co.uk>
Date: Sun, 5 Jun 2022 19:43:43 +0100
Subject: [PATCH] Try and consolidate more Github tests. In the hopes of
 speeding up CI build times.

---
 .github/workflows/ci.yml | 12 ++++++------
 test/Jamfile.v2          |  9 ++++++++-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8f85be64d..0b1ad2f4a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
       matrix:
         compiler: [ g++-12, clang++-14 ]
         standard: [ c++14, c++17, c++20 ]
-        suite: [ float128_tests, special_fun, distribution_tests, misc, quadrature, mp, interpolators, autodiff, ../example//examples, ../tools ]
+        suite: [ github_ci_block_1, github_ci_block_2 ]
     steps:
       - uses: actions/checkout@v2
         with:
@@ -147,7 +147,7 @@ jobs:
       matrix:
         toolset: [ clang ]
         standard: [ 11, 14, 17, 20 ]
-        suite: [ float128_tests, special_fun, distribution_tests, misc, quadrature, mp, interpolators, autodiff, ../example//examples, ../tools ]
+        suite: [ github_ci_block_1, github_ci_block_2 ]
     steps:
       - uses: actions/checkout@v2
         with:
@@ -195,7 +195,7 @@ jobs:
       matrix:
         toolset: [ gcc, msvc-14.0, msvc-14.2 ]
         standard: [ 14, 17 ]
-        suite: [ float128_tests, special_fun, distribution_tests, misc, quadrature, mp, interpolators, autodiff, ../example//examples, ../tools ]
+        suite: [ github_ci_block_1, github_ci_block_2 ]
     steps:
       - uses: actions/checkout@v2
         with:
@@ -242,7 +242,7 @@ jobs:
       fail-fast: false
       matrix:
         standard: [ 14, 17, 20 ]
-        suite: [ float128_tests, special_fun, distribution_tests, misc, quadrature, mp, interpolators, autodiff, ../example//examples, ../tools ]
+        suite: [ github_ci_block_1, github_ci_block_2 ]
     steps:
       - uses: actions/checkout@v2
         with:
@@ -285,7 +285,7 @@ jobs:
       matrix:
         compiler: [ g++-11 ]
         standard: [ c++17 ]
-        suite: [ float128_tests, special_fun, distribution_tests, misc, quadrature, mp, interpolators, autodiff, ../example//examples, ../tools ]
+        suite: [ github_ci_block_1, github_ci_block_2 ]
     env:
       TOOLSET: gcc
     steps:
@@ -415,7 +415,7 @@ jobs:
       matrix:
         compiler: [ g++-10 ]
         standard: [ c++14, c++17, c++20 ]
-        suite: [ float128_tests, special_fun, distribution_tests, misc, quadrature, interpolators, autodiff, ../example//examples, ../tools ]
+        suite: [ github_ci_block_1, github_ci_block_2 ]
     steps:
       - uses: actions/checkout@v2
         with:
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index e4ab283cd..2708b2809 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -1633,4 +1633,11 @@ alias no_eh_tests :
    tools_workaround_incl_test
 ;
 
-explicit no_eh_tests ;
\ No newline at end of file
+explicit no_eh_tests ;
+
+# Some aliases which group blocks of tests for CI testing:
+
+alias github_ci_block_1 : special_fun float128_tests distribution_tests mp misc ;
+alias github_ci_block_2 : quadrature interpolators autodiff ../example//examples ../tools ;
+explicit github_ci_block_1 ;
+explicit github_ci_block_2 ;