From ae3c77f45b03c6e02021b04fd62abf51046434a0 Mon Sep 17 00:00:00 2001 From: Brett Logan Date: Thu, 9 Feb 2023 01:48:06 -0500 Subject: [PATCH] Enable merge queue Signed-off-by: Brett Logan --- .github/workflows/ci.yml | 1 + .github/workflows/trivy.yml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1b210165..b58c80cb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,6 +2,7 @@ name: Build and Test on: pull_request: + merge_group: jobs: test: diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml index 2526dc00..8055044b 100644 --- a/.github/workflows/trivy.yml +++ b/.github/workflows/trivy.yml @@ -6,6 +6,8 @@ on: branches: - main pull_request: + merge_group: + permissions: contents: read