From e58fcbc791110abde607ebe45ec1694ef4b5215f Mon Sep 17 00:00:00 2001
From: clabby <ben@clab.by>
Date: Mon, 27 May 2024 11:32:20 -0400
Subject: [PATCH] fix(ci): Run CI on `pull_request` and `merge_group` triggers

## Overview

Adds extra triggers to the `fpvm-tests` and `rust-ci` workflows that
trigger jobs on PR creation / re-opening as well as when a PR is added
to the merge queue.

This should fix CI for external contributors, cc @merklefruit
---
 .github/workflows/{cross-docker.yaml => cross_docker.yaml} | 4 +---
 .github/workflows/{fpvm-tests.yaml => fpvm_tests.yaml}     | 6 +++++-
 .github/workflows/{ci.yaml => rust_ci.yaml}                | 6 +++++-
 3 files changed, 11 insertions(+), 5 deletions(-)
 rename .github/workflows/{cross-docker.yaml => cross_docker.yaml} (96%)
 rename .github/workflows/{fpvm-tests.yaml => fpvm_tests.yaml} (98%)
 rename .github/workflows/{ci.yaml => rust_ci.yaml} (97%)

diff --git a/.github/workflows/cross-docker.yaml b/.github/workflows/cross_docker.yaml
similarity index 96%
rename from .github/workflows/cross-docker.yaml
rename to .github/workflows/cross_docker.yaml
index 52e9765b..795c3605 100644
--- a/.github/workflows/cross-docker.yaml
+++ b/.github/workflows/cross_docker.yaml
@@ -1,7 +1,5 @@
 name: Build and Publish Cross Images
-on:
-  workflow_dispatch:
-  workflow_call:
+on: [workflow_dispatch, workflow_call]
 env:
   REGISTRY: ghcr.io
 jobs:
diff --git a/.github/workflows/fpvm-tests.yaml b/.github/workflows/fpvm_tests.yaml
similarity index 98%
rename from .github/workflows/fpvm-tests.yaml
rename to .github/workflows/fpvm_tests.yaml
index 14b578a2..06a87772 100644
--- a/.github/workflows/fpvm-tests.yaml
+++ b/.github/workflows/fpvm_tests.yaml
@@ -1,5 +1,9 @@
 name: FPVM
-on: [push]
+on:
+  push:
+  merge_group:
+  pull_request:
+    types: [opened, reopened]
 env:
   CARGO_TERM_COLOR: always
 jobs:
diff --git a/.github/workflows/ci.yaml b/.github/workflows/rust_ci.yaml
similarity index 97%
rename from .github/workflows/ci.yaml
rename to .github/workflows/rust_ci.yaml
index 2e7ef787..3c7c1d8d 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/rust_ci.yaml
@@ -1,5 +1,9 @@
 name: Rust CI
-on: [push]
+on:
+  push:
+  merge_group:
+  pull_request:
+    types: [opened, reopened]
 env:
   CARGO_TERM_COLOR: always
 jobs: