diff --git a/.github/sync-with-template-delete.list b/.github/sync-with-template-delete.list index 5b39f0c..141e72a 100644 --- a/.github/sync-with-template-delete.list +++ b/.github/sync-with-template-delete.list @@ -1,2 +1,3 @@ .github/workflows/auto-assign-issue.yml .github/workflows/codespell.yml +.github/workflows/rebase-dependabot-pull-requests.yml diff --git a/.github/workflows/rebase-dependabot-pull-requests.yml b/.github/workflows/rebase-dependabot-pull-requests.yml deleted file mode 100644 index adb997f..0000000 --- a/.github/workflows/rebase-dependabot-pull-requests.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: Rebase Dependabot pull requests - -on: - push: - paths: - - '.github/workflows/rebase-dependabot-pull-requests.yml' - branches: - - 'main' - - 'master' - schedule: - - cron: '33 2/4 * * *' # sync-with-template: adjust - workflow_dispatch: { } - -permissions: - pull-requests: write - issues: write - contents: read - -concurrency: - group: rebase-dependabot-pull-requests-${{github.ref}} - cancel-in-progress: true - -defaults: - run: - shell: bash - -jobs: - rebase-dependabot-pull-requests: - name: Rebase Dependabot pull requests - runs-on: ubuntu-latest - timeout-minutes: 15 - steps: - - name: Rebase Dependabot pull requests - uses: remal-github-actions/rebase-dependabot-pull-requests@v1 diff --git a/.mergify/config.yml b/.mergify/config.yml index 108b5a8..81bb26a 100644 --- a/.mergify/config.yml +++ b/.mergify/config.yml @@ -25,7 +25,7 @@ pull_request_rules: - name: Sync with template conditions: - - 'author=remal' + - 'author~=^(remal|repository-token-issuer\[bot\])$' - 'label=sync-with-template' - '#added-files=0' - '#removed-files=0'