From f6d53019827f348764c0f65d2d23f3df5540819a Mon Sep 17 00:00:00 2001
From: Julie Schwartz <quark@bluespec.com>
Date: Mon, 19 Feb 2024 09:07:06 +1300
Subject: [PATCH 1/2] GitHub CI: Disable Toooba test for macos-13

until the segfault in elf_to_hex is resolved
---
 .github/workflows/build-and-test-macos.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build-and-test-macos.yml b/.github/workflows/build-and-test-macos.yml
index 46e2f3cc..bdca9c64 100644
--- a/.github/workflows/build-and-test-macos.yml
+++ b/.github/workflows/build-and-test-macos.yml
@@ -187,6 +187,7 @@ jobs:
   test-toooba-macOS:
     name: "Test Toooba ${{ inputs.os }} ghc-${{ inputs.ghc_version }}"
     runs-on: ${{ inputs.os }}
+    if: ${{ inputs.os != 'macos-13' }}
     needs: build-macos
     steps:
       - uses: actions/checkout@v3

From 7ac48b41cd848e3ebb7d5671077310719e0d5f5c Mon Sep 17 00:00:00 2001
From: Julie Schwartz <quark@bluespec.com>
Date: Mon, 19 Feb 2024 16:06:17 +1300
Subject: [PATCH 2/2] GitHub CI: Shorten the timeout for jobs

---
 .github/workflows/build-and-test-macos.yml  | 5 +++++
 .github/workflows/build-and-test-ubuntu.yml | 5 +++++
 .github/workflows/ci.yml                    | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/.github/workflows/build-and-test-macos.yml b/.github/workflows/build-and-test-macos.yml
index bdca9c64..3baadcfa 100644
--- a/.github/workflows/build-and-test-macos.yml
+++ b/.github/workflows/build-and-test-macos.yml
@@ -20,6 +20,7 @@ jobs:
   build-macOS:
     name: "Build: ${{ inputs.os }} ghc-${{ inputs.ghc_version }}"
     runs-on: ${{ inputs.os }}
+    timeout-minutes: 30
     steps:
       - uses: actions/checkout@v3
       - name: Checkout submodules
@@ -120,6 +121,7 @@ jobs:
   test-macOS:
     name: "Test ${{ inputs.os }} ghc-${{ inputs.ghc_version }}"
     runs-on: ${{ inputs.os }}
+    timeout-minutes: 240
     needs: build-macos
     steps:
       - uses: actions/checkout@v3
@@ -187,6 +189,7 @@ jobs:
   test-toooba-macOS:
     name: "Test Toooba ${{ inputs.os }} ghc-${{ inputs.ghc_version }}"
     runs-on: ${{ inputs.os }}
+    timeout-minutes: 60
     if: ${{ inputs.os != 'macos-13' }}
     needs: build-macos
     steps:
@@ -265,6 +268,7 @@ jobs:
   test-contrib-macOS:
     name: "Test bsc-contrib ${{ inputs.os }} ghc-${{ inputs.ghc_version }}"
     runs-on: ${{ inputs.os }}
+    timeout-minutes: 30
     needs: build-macos
     steps:
       - uses: actions/checkout@v3
@@ -341,6 +345,7 @@ jobs:
   test-bdw-macOS:
     name: "Test bdw ${{ inputs.os }} ghc-${{ inputs.ghc_version }}"
     runs-on: ${{ inputs.os }}
+    timeout-minutes: 30
     needs: build-macos
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/build-and-test-ubuntu.yml b/.github/workflows/build-and-test-ubuntu.yml
index ac667d2b..3483e4bc 100644
--- a/.github/workflows/build-and-test-ubuntu.yml
+++ b/.github/workflows/build-and-test-ubuntu.yml
@@ -20,6 +20,7 @@ jobs:
   build-ubuntu:
     name: "Build: ${{ inputs.os }} ghc-${{ inputs.ghc_version }}"
     runs-on: ${{ inputs.os }}
+    timeout-minutes: 30
     steps:
       - uses: actions/checkout@v3
       - name: Checkout submodules
@@ -104,6 +105,7 @@ jobs:
   test-ubuntu:
     name: "Test ${{ inputs.os }} ghc-${{ inputs.ghc_version }}"
     runs-on: ${{ inputs.os }}
+    timeout-minutes: 120
     needs: build-ubuntu
     steps:
       - uses: actions/checkout@v3
@@ -170,6 +172,7 @@ jobs:
   test-toooba-ubuntu:
     name: "Test Toooba ${{ inputs.os }} ghc-${{ inputs.ghc_version }}"
     runs-on: ${{ inputs.os }}
+    timeout-minutes: 30
     needs: build-ubuntu
     steps:
       - uses: actions/checkout@v3
@@ -253,6 +256,7 @@ jobs:
   test-contrib-ubuntu:
     name: "Test bsc-contrib ${{ inputs.os }} ghc-${{ inputs.ghc_version }}"
     runs-on: ${{ inputs.os }}
+    timeout-minutes: 30
     needs: build-ubuntu
     steps:
       - uses: actions/checkout@v3
@@ -334,6 +338,7 @@ jobs:
   test-bdw-ubuntu:
     name: "Test bdw ${{ inputs.os }} ghc-${{ inputs.ghc_version }}"
     runs-on: ${{ inputs.os }}
+    timeout-minutes: 30
     needs: build-ubuntu
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 881028d7..6fd251f4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,6 +7,7 @@ jobs:
   build-check-src:
     name: "Check: code cleanliness"
     runs-on: ubuntu-20.04
+    timeout-minutes: 15
     steps:
       - uses: actions/checkout@v3
       - name: Check tabs and whitespace
@@ -16,6 +17,7 @@ jobs:
   build-check-testsuite:
     name: "Check: testsuite lint"
     runs-on: ubuntu-20.04
+    timeout-minutes: 15
     steps:
       - uses: actions/checkout@v3
       - name: Check CONFDIR
@@ -75,6 +77,7 @@ jobs:
       fail-fast: false
     name: "Build doc: ${{ matrix.os }}"
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 15
     steps:
       - uses: actions/checkout@v3
       - name: Install dependencies
@@ -112,6 +115,7 @@ jobs:
       fail-fast: false
     name: "Build doc: ${{ matrix.os }}"
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 60
     steps:
       - uses: actions/checkout@v3
       - name: Install dependencies
@@ -155,6 +159,7 @@ jobs:
       fail-fast: false
     name: "Build releasenotes: ${{ matrix.os }}"
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 15
     steps:
       - uses: actions/checkout@v3
       - name: Install dependencies