From bf5342fa235944f26932a0d8dc190b330ca23e0e Mon Sep 17 00:00:00 2001
From: Martijn Bastiaan <martijn@qbaylogic.com>
Date: Wed, 4 Jan 2023 13:53:56 +0100
Subject: [PATCH 1/2] Only run GHA tests on PRs

We're only interested in creating build caches on 'master'
---
 .github/workflows/ci.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b3af3db05d..e030d1b492 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -90,6 +90,7 @@ jobs:
         run: stack build --pedantic
 
       - name: Run Vector testsuite
+        if: github.ref != 'refs/heads/master'
         run: stack run -- clash-testsuite --hide-successes -p .Vector. --no-ghdl --no-verilator --no-modelsim --no-vivado
 
   build_and_test:
@@ -165,6 +166,7 @@ jobs:
         run: ./.ci/build.sh
 
       - name: Unit Tests
+        if: github.ref != 'refs/heads/master'
         run: |
           cabal v2-test clash-prelude
           cabal v2-test clash-lib
@@ -172,12 +174,15 @@ jobs:
           cabal v2-test clash-cosim
 
       - name: Testsuite (VHDL)
+        if: github.ref != 'refs/heads/master'
         run: cabal v2-run clash-testsuite -- -j$THREADS --hide-successes -p .VHDL --no-vivado
 
       - name: Testsuite (Verilog)
+        if: github.ref != 'refs/heads/master'
         run: cabal v2-run clash-testsuite -- -j$THREADS --hide-successes -p .Verilog --no-vivado
 
       - name: Testsuite (SystemVerilog)
+        if: github.ref != 'refs/heads/master'
         run: cabal v2-run clash-testsuite -- -j$THREADS --hide-successes -p .SystemVerilog --no-modelsim --no-vivado
 
 

From 8271a4e7ae581e2df8541f0c93eed6b48055dbf9 Mon Sep 17 00:00:00 2001
From: Martijn Bastiaan <martijn@qbaylogic.com>
Date: Wed, 4 Jan 2023 14:20:47 +0100
Subject: [PATCH 2/2] Revert "Set `bot_account` settings in `.mergify.yml`
 (#2395)"

This reverts commit e4964dfe74a4a6e9ab57923ea7243344694f4052.

Setting it to `clash-lang-builder` results in (unresolvable) errors on
PRs. Setting it to the recommended `{ author }` yields a "not a valid
value for dictionary value ..." error. I guess we'll have to live with
Mergify's warnings for now.
---
 .mergify.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 2e17a4e2ca..a9ebabb792 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -9,7 +9,6 @@ pull_request_rules:
       - merged
     actions:
       copy:
-        bot_account: clash-lang-builder
         ignore_conflicts: True
         branches:
           - "1.2"
@@ -21,7 +20,6 @@ pull_request_rules:
       - merged
     actions:
       copy:
-        bot_account: clash-lang-builder
         ignore_conflicts: True
         branches:
           - "1.4"
@@ -33,11 +31,8 @@ pull_request_rules:
       - merged
     actions:
       copy:
-        bot_account: clash-lang-builder
         ignore_conflicts: True
         branches:
           - "1.6"
       queue:
-        update_bot_account: clash-lang-builder
-        merge_bot_account: clash-lang-builder
         update_method: rebase