From aef3a6d0f22c77b8bfebd9d84812b0621bbaa982 Mon Sep 17 00:00:00 2001
From: Michael Beemer <beeme1mr@users.noreply.github.com>
Date: Tue, 5 Nov 2024 20:12:46 +0000
Subject: [PATCH] ci: update release process

Signed-off-by: Michael Beemer <beeme1mr@users.noreply.github.com>
---
 .github/workflows/dco-exceptions.yaml  | 18 ++++++++++++++++++
 .github/workflows/dco-merge-group.yaml | 15 ---------------
 .github/workflows/release.yaml         |  2 +-
 release-please-config.json             |  1 +
 4 files changed, 20 insertions(+), 16 deletions(-)
 create mode 100644 .github/workflows/dco-exceptions.yaml
 delete mode 100644 .github/workflows/dco-merge-group.yaml

diff --git a/.github/workflows/dco-exceptions.yaml b/.github/workflows/dco-exceptions.yaml
new file mode 100644
index 0000000..c70207b
--- /dev/null
+++ b/.github/workflows/dco-exceptions.yaml
@@ -0,0 +1,18 @@
+name: DCO
+on:
+  merge_group:
+  pull_request:
+
+permissions:  # set top-level default permissions as security best practice
+  contents: read # Check https://github.com/ossf/scorecard/blob/7ce8609469289d5f3b1bf5ee3122f42b4e3054fb/docs/checks.md#token-permissions
+
+jobs:
+  DCO:
+    runs-on: ubuntu-latest
+    steps:
+      - if: ${{ github.event_name == 'merge_group' }}
+        run: echo "skipping DCO check for the merge group"
+
+      ## Allow openfeaturebo skip DCO checks
+      - if: ${{ github.event_name == 'pull_request' && github.actor == 'openfeaturebot' }}
+        run: echo "skipping DCO for the OpenFeature Bot"
\ No newline at end of file
diff --git a/.github/workflows/dco-merge-group.yaml b/.github/workflows/dco-merge-group.yaml
deleted file mode 100644
index 3ae563e..0000000
--- a/.github/workflows/dco-merge-group.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-# based on https://github.com/onnx/onnx/blob/main/.github/workflows/dco_merge_group.yml
-
-name: DCO
-on:
-  merge_group:
-
-permissions:  # set top-level default permissions as security best practice
-  contents: read # Check https://github.com/ossf/scorecard/blob/7ce8609469289d5f3b1bf5ee3122f42b4e3054fb/docs/checks.md#token-permissions
-
-jobs:
-  DCO:
-    runs-on: ubuntu-latest
-    if: ${{ github.actor != 'dependabot[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"
\ No newline at end of file
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index d9eb0e2..90e4c31 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -19,7 +19,7 @@ jobs:
       - uses: googleapis/release-please-action@v4
         id: release
         with:
-          token: ${{secrets.GITHUB_TOKEN}}
+          token: ${{secrets.RELEASE_PLEASE_ACTION_TOKEN}}
           target-branch: main
       - name: Dump Release Please Output
         env:
diff --git a/release-please-config.json b/release-please-config.json
index 6186f5b..fedbd60 100644
--- a/release-please-config.json
+++ b/release-please-config.json
@@ -1,4 +1,5 @@
 {
+  "signoff": "OpenFeature Bot <109696520+openfeaturebot@users.noreply.github.com>",
   "packages": {
     ".": {
       "release-type": "go",