Temp changes to test make boot

PandABlocks · Oct 9, 2024 · 610fad6 · 610fad6
1 parent ab3998b
commit 610fad6
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 27 deletions.
diff --git a/.github/workflows/_make_boot.yml b/.github/workflows/_make_boot.yml
@@ -33,7 +33,6 @@ jobs:
         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
@@ -42,6 +41,8 @@ jobs:
           if test -f /build/boot*.zip; then
             echo "boot_files=true" >> $GITHUB_OUTPUT
           fi
+          ps -Ao pid= -o comm=
+          ps -Ao pid= -o comm= | awk '$2 ~ /dbus/ { print $1}' | xargs kill
 
       # Current workflow hangs upon make_boot completion, requiring a timeout
       # Envvar boot_files is set true if timeout reached after successful boot build
@@ -56,4 +57,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: boot-${{ matrix.app }}
-          path: /build/boot*.zip
+          path: /build/boot*.zip
diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml
@@ -16,31 +16,31 @@ jobs:
   make_boot:
     uses: ./.github/workflows/_make_boot.yml
 
-  # Make zpkg for FPGA apps
-  make_zpkg:
-    uses: ./.github/workflows/_make_zpkg.yml
+  # # Make zpkg for FPGA apps
+  # 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
+  # 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 ]
-    uses: ./.github/workflows/_release.yml
-
-  # Generate job matrix to evenly split tests
-  test_matrix:
-    uses: ./.github/workflows/_test_matrix.yml
-
-  # python and autogen tests
-  test_python_autogen:
-    uses: ./.github/workflows/_test_python_autogen.yml
-
-  # hdl tests
-  test_hdl:
-    needs: [test_matrix, test_python_autogen]
-    uses: ./.github/workflows/_test_hdl.yml
-    with:
-      matrix: ${{needs.test_matrix.outputs.matrix}}
+  # # Release on push to tag
+  # release:
+  #   needs: [ make_boot, make_zpkg, test_hdl, test_matrix, test_python_autogen ]
+  #   uses: ./.github/workflows/_release.yml
+
+  # # Generate job matrix to evenly split tests
+  # test_matrix:
+  #   uses: ./.github/workflows/_test_matrix.yml
+
+  # # python and autogen tests
+  # test_python_autogen:
+  #   uses: ./.github/workflows/_test_python_autogen.yml
+
+  # # hdl tests
+  # test_hdl:
+  #   needs: [test_matrix, test_python_autogen]
+  #   uses: ./.github/workflows/_test_hdl.yml
+  #   with:
+  #     matrix: ${{needs.test_matrix.outputs.matrix}}