From b57cd56717041bec6884dc587d8d4a7bf536509a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=88=98?= <632171029@qq.com>
Date: Thu, 15 Aug 2024 09:24:46 +0800
Subject: [PATCH] vbs: Handle cherry-pick conflicts

---
 .github/workflows/main.yml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index bb1074b70a..a982c7c2d6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -83,7 +83,13 @@ jobs:
         if: ${{ github.event.inputs.self-hosted == 'yes' }}
         run: |
           export ${{ matrix.IMPL }}
-          DO_SELF_HOST=1 ./ci.sh test ${IMPL}
+          if [ "${NO_SELF_HOST}" ]; then
+            echo "Skipping self-host for ${IMPL} due to NO_SELF_HOST variable"
+          else
+            DO_SELF_HOST=1 ./ci.sh test ${IMPL}
+            # Check that self-hosted mode really ran
+            [ "`grep -a "mal-user>" test-mal-*${IMPL}.debug | wc -l`" -gt 800 ]
+          fi
       - name: Archive logs and debug output
         uses: actions/upload-artifact@v4
         with:
@@ -121,7 +127,13 @@ jobs:
         if: ${{ github.event.inputs.self-hosted == 'yes' }}
         run: |
           export ${{ matrix.IMPL }}
-          DO_SELF_HOST=1 ./ci.sh test ${IMPL}
+          if [ "${NO_SELF_HOST}" ]; then
+            echo "Skipping self-host for ${IMPL} due to NO_SELF_HOST variable"
+          else
+            DO_SELF_HOST=1 ./ci.sh test ${IMPL}
+            # Check that self-hosted mode really ran
+            [ "`grep -a "mal-user>" test-mal-*${IMPL}.debug | wc -l`" -gt 800 ]
+          fi
       - name: Archive logs and debug output
         uses: actions/upload-artifact@v4
         with: