From 2ed39efb01322da4c98c3765d82b6f5723d282a3 Mon Sep 17 00:00:00 2001 From: Michael Beemer Date: Fri, 31 Jan 2025 12:13:37 -0500 Subject: [PATCH] ci: add dco workaround, run tests for merge queues (#740) Signed-off-by: Michael Beemer --- .github/workflows/dco-merge-group.yml | 12 ++++++++++++ .github/workflows/pr-checks.yml | 11 +++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/dco-merge-group.yml diff --git a/.github/workflows/dco-merge-group.yml b/.github/workflows/dco-merge-group.yml new file mode 100644 index 000000000..0241f80a8 --- /dev/null +++ b/.github/workflows/dco-merge-group.yml @@ -0,0 +1,12 @@ +name: DCO +on: + merge_group: + +# Workaround because the DCO app doesn't run on a merge_group trigger +# https://github.com/dcoapp/app/pull/200 +jobs: + DCO: + runs-on: ubuntu-latest + if: ${{ github.actor != 'renovate[bot]' }} + steps: + - run: echo "dummy DCO workflow (it won't run any check actually) to trigger by merge_group in order to enable merge queue" diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index 398af9661..b6c979e28 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -4,11 +4,14 @@ on: push: branches: - main - paths-ignore: - - '**.md' pull_request: - paths-ignore: - - '**.md' + types: + - opened + - synchronize + - reopened + branches: + - main + merge_group: permissions: contents: read