Skip to content

Commit

Permalink
ci: Add merge queue workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
blaine-arcjet committed Jan 9, 2024
1 parent 6f28934 commit f522a83
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/examples.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: "Build examples"

on: [push, pull_request]
on: [push, pull_request, workflow_call]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
15 changes: 15 additions & 0 deletions .github/workflows/merge_queue.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: Merge queue

on:
push:
branches:
- trunk-merge/**

jobs:
test:
name: Merge queue - Run tests
uses: ./.github/workflows/test.yml

examples:
name: Merge queue - Build examples
uses: ./.github/workflows/examples.yml
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: "Run tests"

on: [push, pull_request]
on: [push, pull_request, workflow_call]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down

0 comments on commit f522a83

Please sign in to comment.