From 1eb346ccf5cd2d024ba232f44a2ed7d25970bbb8 Mon Sep 17 00:00:00 2001 From: Ryan Turner Date: Fri, 22 Mar 2024 12:45:10 -0700 Subject: [PATCH 1/3] Try out github.com/christophebedard/dco-check The DCO app currently used in the repository doesn't support GitHub merge queues. Try out this other DCO check script which will run as our own managed job that we can configure to run for PRs added to the merge queue. We can try running this check in parallel to the existing check to ensure it's stable before trying to rely on it. Signed-off-by: Ryan Turner --- .github/workflows/dco.yaml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/workflows/dco.yaml diff --git a/.github/workflows/dco.yaml b/.github/workflows/dco.yaml new file mode 100644 index 0000000000..a24018786a --- /dev/null +++ b/.github/workflows/dco.yaml @@ -0,0 +1,21 @@ +name: DCO +on: + pull_request: {} + merge_group: + types: + - checks_requested +jobs: + check: + runs-on: ubuntu-latest + steps: + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - name: Set up Python 3.x + uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0 + with: + python-version: '3.x' + - name: Check DCO + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + pip3 install -U dco-check + dco-check From a1570b6254855cf7c7916cb04352b0604ad9367f Mon Sep 17 00:00:00 2001 From: Ryan Turner Date: Fri, 22 Mar 2024 13:03:34 -0700 Subject: [PATCH 2/3] Fix YAML syntax Signed-off-by: Ryan Turner --- .github/workflows/dco.yaml | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/dco.yaml b/.github/workflows/dco.yaml index a24018786a..37c37ac4b2 100644 --- a/.github/workflows/dco.yaml +++ b/.github/workflows/dco.yaml @@ -5,17 +5,18 @@ on: types: - checks_requested jobs: - check: + check-dco: runs-on: ubuntu-latest steps: - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - - name: Set up Python 3.x - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0 - with: - python-version: '3.x' - - name: Check DCO - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - pip3 install -U dco-check - dco-check + - name: Checkout + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - name: Set up Python 3.x + uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0 + with: + python-version: '3.x' + - name: Check DCO + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + pip3 install -U dco-check + dco-check From 807d4b21f33480b7c1893697d30372ee5f9a571c Mon Sep 17 00:00:00 2001 From: Ryan Turner Date: Fri, 22 Mar 2024 13:09:39 -0700 Subject: [PATCH 3/3] Allow to run on workflow_dispatch Signed-off-by: Ryan Turner --- .github/workflows/dco.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dco.yaml b/.github/workflows/dco.yaml index 37c37ac4b2..5141f09d56 100644 --- a/.github/workflows/dco.yaml +++ b/.github/workflows/dco.yaml @@ -1,6 +1,7 @@ name: DCO on: pull_request: {} + workflow_dispatch: {} merge_group: types: - checks_requested