Fixing Windows builder, building docs on CircleCI

STEllAR-GROUP · May 19, 2022 · 27c3fc2 · 27c3fc2
1 parent adc1491
commit 27c3fc2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -211,7 +211,7 @@ jobs:
             cmake --version
             if [ -z "$CIRCLE_PR_NUMBER" ] && \
                 ( [ "$CIRCLE_BRANCH" == "master" ] || \
-                  [ "$CIRCLE_BRANCH" =~ "^release." ] || \
+                  [[ "$CIRCLE_BRANCH" =~ ^release.* ]] || \
                   [ -n "$CIRCLE_TAG" ] ); then
                 DOCUMENTATION_OUTPUT_FORMATS="html;singlehtml;latexpdf"
             else

diff --git a/libs/core/resource_partitioner/examples/async_customization.cpp b/libs/core/resource_partitioner/examples/async_customization.cpp
@@ -313,6 +313,7 @@ int test(const std::string& message, Executor& exec)
     HPX_TEST_EQ(fts.get(), "then(shared)");
     std::cout << std::endl;
 
+#if !defined(HPX_MSVC)
     // test 3a
     std::cout << "============================" << std::endl;
     std::cout << "Test 3a : when_all()" << std::endl;
@@ -367,6 +368,7 @@ int test(const std::string& message, Executor& exec)
                 });
     HPX_TEST_EQ(fws.get(), "when_all(shared)");
     std::cout << std::endl;
+#endif
 
     // test 4a
     std::cout << "============================" << std::endl;