diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7b78325d..05c4e7fb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,6 +7,7 @@ on: pull_request: branches: - 'main' + merge_group: jobs: main: diff --git a/.github/workflows/dco_work_group.yml b/.github/workflows/dco_work_group.yml new file mode 100644 index 00000000..fe464fcf --- /dev/null +++ b/.github/workflows/dco_work_group.yml @@ -0,0 +1,15 @@ +# 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" diff --git a/renovate.json b/renovate.json index 3769f95a..2bde535a 100644 --- a/renovate.json +++ b/renovate.json @@ -1,15 +1,8 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "description": "Default preset for use with OpenFeature's repos", - "extends": ["config:recommended"], - "semanticCommits": "enabled", - "automergeType": "branch", - "configMigration": true, + "extends": [ "github>open-feature/community-tooling" ], "dependencyDashboard": true, - "prCreation": "not-pending", - "rebaseWhen": "behind-base-branch", - "platformAutomerge": true, - "platformCommit": true, "npm": { "packageRules": [ { @@ -39,16 +32,4 @@ } ] }, - "packageRules": [ - { - "description": "Automerge non-major updates", - "matchUpdateTypes": ["minor", "patch"], - "matchCurrentVersion": "!/^0/", - "automerge": true - }, - { - "matchManagers": ["github-actions"], - "automerge": true - } - ] }