From 99631017fd389c5d3a3db4616f192549764e881e Mon Sep 17 00:00:00 2001 From: Simar Date: Wed, 26 Jul 2023 18:46:15 -0600 Subject: [PATCH] chore(github): Enable merge-queues for defsec PRs Signed-off-by: Simar --- .github/workflows/adapter-lint.yml | 1 + .github/workflows/lint.yml | 1 + .github/workflows/test-bundle.yml | 1 + .github/workflows/test-go.yml | 1 + .github/workflows/test-rego.yaml | 1 + .github/workflows/verify-schema.yml | 1 + 6 files changed, 6 insertions(+) diff --git a/.github/workflows/adapter-lint.yml b/.github/workflows/adapter-lint.yml index 8144621f7..77bb0887c 100644 --- a/.github/workflows/adapter-lint.yml +++ b/.github/workflows/adapter-lint.yml @@ -1,6 +1,7 @@ name: adapter-lint on: pull_request: + merge_group: jobs: adapter-lint: runs-on: ubuntu-latest diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index ed73929ae..bbd150b36 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -7,6 +7,7 @@ on: - master - main pull_request: + merge_group: permissions: contents: read pull-requests: read diff --git a/.github/workflows/test-bundle.yml b/.github/workflows/test-bundle.yml index 89b07af68..f26992b7e 100644 --- a/.github/workflows/test-bundle.yml +++ b/.github/workflows/test-bundle.yml @@ -1,6 +1,7 @@ name: test rego bundle on: pull_request: + merge_group: env: GO_VERSION: "1.18" jobs: diff --git a/.github/workflows/test-go.yml b/.github/workflows/test-go.yml index f4d9947d1..570451a28 100755 --- a/.github/workflows/test-go.yml +++ b/.github/workflows/test-go.yml @@ -1,6 +1,7 @@ name: test go on: pull_request: + merge_group: schedule: - cron: 0 23 * * * jobs: diff --git a/.github/workflows/test-rego.yaml b/.github/workflows/test-rego.yaml index 30e6510de..bf9e1dc91 100644 --- a/.github/workflows/test-rego.yaml +++ b/.github/workflows/test-rego.yaml @@ -10,6 +10,7 @@ on: paths-ignore: - '**/*.md' - 'LICENSE' + merge_group: env: GO_VERSION: "1.18" jobs: diff --git a/.github/workflows/verify-schema.yml b/.github/workflows/verify-schema.yml index 077b210a1..ad7fe85a5 100755 --- a/.github/workflows/verify-schema.yml +++ b/.github/workflows/verify-schema.yml @@ -1,6 +1,7 @@ name: verify schema on: pull_request: + merge_group: jobs: build: name: verifying schema