From 39d1fc939a9980e19a01f69719ef82eb7332f54d Mon Sep 17 00:00:00 2001
From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
Date: Mon, 28 Feb 2022 17:08:52 +0000
Subject: [PATCH] Use pkill (killall has a failuremode of killing PID 1 on some
 systems)

---
 .github/workflows/nightly.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index d114a2aa11..449c494600 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -115,6 +115,9 @@ jobs:
         if: always()
         id: get-comment-body-session
         run: python3 ./tools/ci/render_test_output.py session ./matrix-sdk-android/build/outputs/androidTest-results/connected/*.xml
+      - name: Remove adb logcat
+        if: always()
+        run: pkill -9 adb
       - name: Run integration tests for  Matrix SDK [org.matrix.android.sdk.account] API[${{ matrix.api-level }}]
         if: always()
         uses: reactivecircus/android-emulator-runner@v2
@@ -136,6 +139,9 @@ jobs:
         if: always()
         id: get-comment-body-account
         run: python3 ./tools/ci/render_test_output.py account ./matrix-sdk-android/build/outputs/androidTest-results/connected/*.xml
+      - name: Remove adb logcat
+        if: always()
+        run: pkill -9 adb
       # package: org.matrix.android.sdk.internal
       - name: Run integration tests for Matrix SDK [org.matrix.android.sdk.internal] API[${{ matrix.api-level }}]
         if: always()
@@ -158,6 +164,9 @@ jobs:
         if: always()
         id: get-comment-body-internal
         run: python3 ./tools/ci/render_test_output.py internal ./matrix-sdk-android/build/outputs/androidTest-results/connected/*.xml
+      - name: Remove adb logcat
+        if: always()
+        run: pkill -9 adb
       # package: org.matrix.android.sdk.ordering
       - name: Run integration tests for Matrix SDK [org.matrix.android.sdk.ordering] API[${{ matrix.api-level }}]
         if: always()
@@ -180,6 +189,9 @@ jobs:
         if: always()
         id: get-comment-body-ordering
         run: python3 ./tools/ci/render_test_output.py ordering ./matrix-sdk-android/build/outputs/androidTest-results/connected/*.xml
+      - name: Remove adb logcat
+        if: always()
+        run: pkill -9 adb
       # package: class PermalinkParserTest
       - name: Run integration tests for Matrix SDK class [org.matrix.android.sdk.PermalinkParserTest] API[${{ matrix.api-level }}]
         if: always()
@@ -202,6 +214,9 @@ jobs:
         if: always()
         id: get-comment-body-permalink
         run: python3 ./tools/ci/render_test_output.py permalink ./matrix-sdk-android/build/outputs/androidTest-results/connected/*.xml
+      - name: Remove adb logcat
+        if: always()
+        run: pkill -9 adb
       # package: class PermalinkParserTest
       - name: Find Comment
         if: always() && github.event_name == 'pull_request'