Attempt 5

XRPLF · Nov 14, 2024 · 6403b63 · 6403b63
1 parent 22c6de2
commit 6403b63
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 2 deletions.
diff --git a/.github/actions/dependencies/action.yml b/.github/actions/dependencies/action.yml
@@ -24,6 +24,11 @@ runs:
         # Do not quote the URL. An empty string will be accepted (with
         # a non-fatal warning), but a missing argument will not.
         conan remote add ripple ${{ env.CONAN_URL }} --insert 0
+        if [[ "${RUNNER_OS}" = "macOS" ]]
+        then
+          conan profile update 'env.CXXFLAGS="-DBOOST_ASIO_DISABLE_CONCEPTS"' default
+          conan profile update 'conf.tools.build:cxxflags+=["-DBOOST_ASIO_DISABLE_CONCEPTS"]' default
+        fi
     - name: try to authenticate to Ripple Conan remote
       id: remote
       shell: bash
@@ -47,6 +52,19 @@ runs:
       run: |
         mkdir ${build_dir}
         cd ${build_dir}
+        # This fixes some dependency build issues, especially on MacOS
+        if [[ "${RUNNER_OS}" = "macOS" && \
+          "${{ steps.binaries.outputs.missing }}" =~ "boost" ]]
+        then
+          conan install \
+            --output-folder . \
+            --build boost \
+            --options tests=True \
+            --options xrpld=True \
+            --settings build_type=${{ inputs.configuration }} \
+            .. || \
+          rm -rfv ~/.conan
+        fi
         conan install \
           --output-folder . \
           --build missing \

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -19,13 +19,18 @@ jobs:
 
   test:
     strategy:
+      fail-fast: false
       matrix:
         platform:
           - macos
         generator:
           - Ninja
         configuration:
           - Release
+          - Debug
+        cmake-args:
+          -
+          - "-Dunity=ON"
     runs-on: [self-hosted, macOS]
     env:
       # The `build` action requires these variables.
@@ -41,13 +46,19 @@ jobs:
       - name: install Ninja
         if: matrix.generator == 'Ninja'
         run: brew install ninja
+        name: install nproc
+        run: |
+          brew install coreutils
       - name: check environment
         run: |
           env | sort
           echo ${PATH} | tr ':' '\n'
           python --version
           conan --version
           cmake --version
+          nproc --version
+          echo -n "nproc returns: "
+          nproc
       - name: configure Conan
         run : |
           conan profile new default --detect || true
@@ -66,6 +77,13 @@ jobs:
         with:
           generator: ${{ matrix.generator }}
           configuration: ${{ matrix.configuration }}
+          cmake-args: ${{ matrix.cmake-args }}
       - name: test
         run: |
-          ${build_dir}/rippled --unittest
+          n=$(nproc)
+          if [[ $n -gt 2 ]]
+          then
+            : $[ n/=2 ]
+          fi
+          echo "Using $n test jobs"
+          ${build_dir}/rippled --unittest --unittest-jobs $n
diff --git a/src/test/jtx/impl/Env.cpp b/src/test/jtx/impl/Env.cpp
@@ -565,7 +565,7 @@ Env::do_rpc(
          ++ctr)
     {
         JLOG(journal.error())
-            << "Env::do_rpc error, retrying, attempt #" << ctr + 1 << "  ...";
+            << "Env::do_rpc error, retrying, attempt #" << ctr + 1 << " ...";
         std::this_thread::sleep_for(std::chrono::milliseconds(500));
 
         response =