From 23ab938fc85e1d6b313015a6f194172b4b3d9c03 Mon Sep 17 00:00:00 2001 From: Bettina Heim Date: Tue, 15 Oct 2024 18:45:28 +0200 Subject: [PATCH] changes needed for merge queue Signed-off-by: Bettina Heim --- .github/workflows/ci.yml | 5 ++++- .github/workflows/dco_merge_queue.yml | 17 +++++++++++++++++ .github/workflows/repo_checks.yml | 3 +++ 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/dco_merge_queue.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c2bba1fddd..d94617a3b2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,10 @@ on: push: branches: - "pull-request/[0-9]+" - + merge_group: + types: + - checks_requested + name: CI # do not change name without updating workflow_run triggers concurrency: diff --git a/.github/workflows/dco_merge_queue.yml b/.github/workflows/dco_merge_queue.yml new file mode 100644 index 0000000000..531b516eb0 --- /dev/null +++ b/.github/workflows/dco_merge_queue.yml @@ -0,0 +1,17 @@ +on: + # Do not add any triggers here! + merge_group: + types: + - checks_requested + +name: DCO (merge queue) + +permissions: {} # no permissions needed. + +jobs: + DCO: + runs-on: ubuntu-latest + steps: + - run: + echo "Enable merge_queue check to pass." + echo "No checks were performed; these checks were already performed during PR workflows." \ No newline at end of file diff --git a/.github/workflows/repo_checks.yml b/.github/workflows/repo_checks.yml index f5d92d5b1f..990b8e528c 100644 --- a/.github/workflows/repo_checks.yml +++ b/.github/workflows/repo_checks.yml @@ -1,6 +1,9 @@ on: workflow_dispatch: pull_request: + merge_group: + types: + - checks_requested name: "Basic content checks"