Skip to content

Commit

Permalink
fix(ci): Run CI on pull_request and merge_group triggers
Browse files Browse the repository at this point in the history
## 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
  • Loading branch information
clabby committed May 27, 2024
1 parent 6766a7d commit e58fcbc
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
name: FPVM
on: [push]
on:
push:
merge_group:
pull_request:
types: [opened, reopened]
env:
CARGO_TERM_COLOR: always
jobs:
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/ci.yaml → .github/workflows/rust_ci.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
name: Rust CI
on: [push]
on:
push:
merge_group:
pull_request:
types: [opened, reopened]
env:
CARGO_TERM_COLOR: always
jobs:
Expand Down

0 comments on commit e58fcbc

Please sign in to comment.