vbs: Handle cherry-pick conflicts

kanaka · Aug 15, 2024 · b57cd56 · b57cd56
1 parent 08856c3
commit b57cd56
Showing 1 changed file with 14 additions and 2 deletions.
diff --git 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: