From c1a750e23b35c3bed84558f864d6191acb9d65d5 Mon Sep 17 00:00:00 2001
From: Tom Trafford <tom.trafford@diamond.ac.uk>
Date: Wed, 9 Oct 2024 11:32:17 +0100
Subject: [PATCH] Kill process causing make boot to hang

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

diff --git a/.github/workflows/_make_boot.yml b/.github/workflows/_make_boot.yml
index 95f7ca067..9f9509812 100644
--- a/.github/workflows/_make_boot.yml
+++ b/.github/workflows/_make_boot.yml
@@ -31,24 +31,12 @@ jobs:
       # Generate bootable image
       - name: Make boot
         id: make_boot
-        continue-on-error: true
-        #timeout set to expected upper-limit of build
-        timeout-minutes: 60
         run: |
           echo "boot_files=false" >> $GITHUB_OUTPUT
           cd repos/PandABlocks-fpga
           ln -s CONFIG.example CONFIG
           make boot APP_NAME=${{ matrix.app }}
-          if test -f /build/boot*.zip; then
-            echo "boot_files=true" >> $GITHUB_OUTPUT
-          fi
-
-      # Current workflow hangs upon make_boot completion, requiring a timeout
-      # Envvar boot_files is set true if timeout reached after successful boot build
-      # Envvar boot_files is set false on boot build error and/or failure to generate zip files
-      - name: Fail workflow if boot files absent
-        if: ${{ steps.make_boot.outputs.boot_files == 'false'}}
-        run: exit 1
+          ps -Ao pid= -o comm= | awk '$2 ~ /Xvfb/ { print $1}' | xargs kill
 
       # Upload artifacts if boot files present
       - name: Upload boot
@@ -56,4 +44,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: boot-${{ matrix.app }}
-          path: /build/boot*.zip
\ No newline at end of file
+          path: /build/boot*.zip