diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2374ec38d1060c..8292a496f34efd 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -257,6 +257,9 @@ jobs:
                   submodules: true
             - name: Setup Environment
               run: brew install openssl pkg-config
+            - name: Try to ensure the directory for diagnostic log collection exists
+              run: |
+                  mkdir -p ~/Library/Logs/DiagnosticReports || true
             - name: Fix pkgconfig link
               working-directory: /usr/local/lib/pkgconfig
               run: |
@@ -292,6 +295,12 @@ jobs:
                       scripts/build/gn_build.sh
                       scripts/tests/gn_tests.sh
                   done
+            - name: Uploading diagnostic logs
+              uses: actions/upload-artifact@v2
+              if: ${{ failure() }} && ${{ !env.ACT }}
+              with:
+                  name: crash-log-darwin
+                  path: ~/Library/Logs/DiagnosticReports/
             # TODO Log Upload https://github.com/project-chip/connectedhomeip/issues/2227
             # TODO https://github.com/project-chip/connectedhomeip/issues/1512
             # - name: Run Code Coverage