[FOLD] Address review feedback from @thejohnfreeman:

* Experimentally remove the `-p` param from mkdir in dependencies action * Add the "build_type" param to the dependencies check in the `nix` workflow * Update the version of actions/cache * Steal the remote step outcome fix from #4716 * Allow the Windows job to succeed if tests fail (explained in comments)
XRPLF · Sep 28, 2023 · 222c7e4 · 222c7e4
1 parent 2f3ddde
commit 222c7e4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/.github/actions/dependencies/action.yml b/.github/actions/dependencies/action.yml
@@ -17,7 +17,7 @@ runs:
     - name: install dependencies
       shell: bash
       run: |
-        mkdir -p ${build_dir}
+        mkdir ${build_dir}
         cd ${build_dir}
         conan install \
           --output-folder . \

diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
@@ -88,7 +88,7 @@ jobs:
         # Print the list of dependencies that would need to be built locally.
         # A non-empty list means we have "failed" to cache binaries remotely.
         run: |
-          echo missing=$(conan info . --build missing --json 2>/dev/null  | grep '^\[') | tee ${GITHUB_OUTPUT}
+          echo missing=$(conan info . --build missing --settings build_type=${{ matrix.configuration }} --json 2>/dev/null  | grep '^\[') | tee ${GITHUB_OUTPUT}
       - name: build dependencies
         if: (steps.binaries.outputs.missing != '[]')
         uses: ./.github/actions/dependencies

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -39,7 +39,7 @@ jobs:
           pip install --upgrade pip
           echo "dir=$(pip cache dir)" | tee ${GITHUB_OUTPUT}
       - name: restore Python cache directory
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
             path: ${{ steps.pip-cache.outputs.dir }}
             key: ${{ runner.os }}-${{ hashFiles('.github/workflows/windows.yml') }}
@@ -66,7 +66,8 @@ jobs:
         shell: bash
         id: remote
         run: |
-          echo outcome=$(conan user --remote ripple ${{ secrets.CONAN_USERNAME }} --password ${{ secrets.CONAN_TOKEN }} && echo success || echo failure) | tee ${GITHUB_OUTPUT}
+          conan user --remote ripple ${{ secrets.CONAN_USERNAME }} --password ${{ secrets.CONAN_TOKEN }}
+          echo outcome=$([ $? -eq 0 ] && echo success || echo failure) | tee ${GITHUB_OUTPUT}
       - name: list missing binaries
         id: binaries
         shell: bash
@@ -91,6 +92,12 @@ jobs:
           cmake-args: '-Dassert=ON -Dreporting=OFF -Dunity=OFF'
       - name: test
         shell: bash
+        # Github runners are resource limited, which causes unit tests to fail
+        # (e.g. OOM). To allow forward progress until self-hosted runners are
+        # up and running reliably, allow the job to succeed even if tests fail.
+        continue-on-error: true
         run: |
-          # ${build_dir}/${{ matrix.configuration }}/rippled --unittest --unittest-jobs $(nproc)
-          ${build_dir}/${{ matrix.configuration }}/rippled --unittest --unittest-jobs 1
+          # Remove these echo statements before merging
+          echo "nproc: $(nproc)"
+          echo "NUMBER_OF_PROCESSORS ${NUMBER_OF_PROCESSORS}"
+          ${build_dir}/${{ matrix.configuration }}/rippled --unittest --unittest-jobs $(nproc)