From 286bcbb78dad2c449a33c3f36919ce3ea959953f Mon Sep 17 00:00:00 2001 From: Martijn Govers Date: Mon, 18 Mar 2024 09:44:57 +0100 Subject: [PATCH 1/3] add DCO for merge groups Signed-off-by: Martijn Govers --- .github/workflows/dco-merge-group.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) 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 00000000..36d01cb2 --- /dev/null +++ b/.github/workflows/dco-merge-group.yml @@ -0,0 +1,23 @@ +# SPDX-FileCopyrightText: Contributors to the Power Grid Model project +# +# SPDX-License-Identifier: MPL-2.0 + +name: DCO for merge groups +# Workaround because DCO plugin does not run on merge group. See https://github.com/dcoapp/app/issues/199 + +# Controls when the workflow will run +on: + # run pipeline on merge queue because DCO plugin does not + merge_group: + # Any other signals are handled by the actual DCO plugin + pull_request: # TODO remove + +jobs: + dco: + name: DCO for merge groups + runs-on: ubuntu-latest + if: ${{ github.actor != 'dependabot[bot]' }} + steps: + - name: "Workaround for DCO on merge groups" + run: | + echo "Workaround: signal DCO for merge queues because DCO plugin does not run for merge queues. See https://github.com/dcoapp/app/issues/199" From 7853837b79f19d92850addd2af3cf2111df27ab4 Mon Sep 17 00:00:00 2001 From: Martijn Govers Date: Mon, 18 Mar 2024 09:45:39 +0100 Subject: [PATCH 2/3] remove test run Signed-off-by: Martijn Govers --- .github/workflows/dco-merge-group.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/dco-merge-group.yml b/.github/workflows/dco-merge-group.yml index 36d01cb2..c3835760 100644 --- a/.github/workflows/dco-merge-group.yml +++ b/.github/workflows/dco-merge-group.yml @@ -10,7 +10,6 @@ on: # run pipeline on merge queue because DCO plugin does not merge_group: # Any other signals are handled by the actual DCO plugin - pull_request: # TODO remove jobs: dco: From eda69470c6ce499b20b1e1966e7b2cc439275beb Mon Sep 17 00:00:00 2001 From: Martijn Govers Date: Mon, 18 Mar 2024 09:50:28 +0100 Subject: [PATCH 3/3] change name to account for status checks Signed-off-by: Martijn Govers --- .github/workflows/dco-merge-group.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dco-merge-group.yml b/.github/workflows/dco-merge-group.yml index c3835760..6b4ab946 100644 --- a/.github/workflows/dco-merge-group.yml +++ b/.github/workflows/dco-merge-group.yml @@ -12,8 +12,8 @@ on: # Any other signals are handled by the actual DCO plugin jobs: - dco: - name: DCO for merge groups + dco-merge-group: + name: DCO runs-on: ubuntu-latest if: ${{ github.actor != 'dependabot[bot]' }} steps: