From 22fdf74c1e869121902d776d2c9209d2cf4281a4 Mon Sep 17 00:00:00 2001
From: Tom Trafford <tom.trafford@diamond.ac.uk>
Date: Mon, 9 Dec 2024 16:00:41 +0000
Subject: [PATCH] Added comment and removed 'undo' job

---
 .github/workflows/_make_boot.yml |  1 +
 .github/workflows/_undo.yml      | 19 -------------------
 .github/workflows/code.yml       |  5 -----
 3 files changed, 1 insertion(+), 24 deletions(-)
 delete mode 100644 .github/workflows/_undo.yml

diff --git a/.github/workflows/_make_boot.yml b/.github/workflows/_make_boot.yml
index 351727998..d892dedbb 100644
--- a/.github/workflows/_make_boot.yml
+++ b/.github/workflows/_make_boot.yml
@@ -31,6 +31,7 @@ jobs:
         uses: ./repos/PandABlocks-fpga/.github/actions/setupenv
 
       # Generate bootable image
+      # The Xvfb process causes the job to hang, so is killed after the image is generated 
       - name: Make boot
         id: make_boot
         run: |
diff --git a/.github/workflows/_undo.yml b/.github/workflows/_undo.yml
deleted file mode 100644
index cc637c8a8..000000000
--- a/.github/workflows/_undo.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-on:
-  workflow_call:
-
-jobs:
-  undo:
-    runs-on: ubuntu-latest
-    if: ${{ always() && failure() && github.event_name == 'push' && contains(github.event.head_commit.message,'undo_true')}}
-    steps: 
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-           ref: ${{ github.event.inputs.branch }}
-           fetch-depth: 0 
-      - name: Revert pushed commit
-        run: |
-          git config --global user.name 'github-actions[bot]'
-          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
-          git revert -m 1 --no-edit HEAD
-          git push
diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml
index 5a3868dba..bc2da45df 100644
--- a/.github/workflows/code.yml
+++ b/.github/workflows/code.yml
@@ -20,11 +20,6 @@ jobs:
   make_zpkg:
     uses: ./.github/workflows/_make_zpkg.yml
 
-  # Optional revert on failed push workflow
-  undo:
-    needs: [ make_boot, make_zpkg, test_hdl ]
-    uses: ./.github/workflows/_undo.yml
-  
   # Release on push to tag
   release:
     needs: [ make_boot, make_zpkg, test_hdl, test_matrix, test_python_autogen ]