diff --git a/.github/workflows/dependabot-auto-merge-forward.yml b/.github/workflows/dependabot-auto-merge-forward.yml deleted file mode 100644 index 4989c57aa1..0000000000 --- a/.github/workflows/dependabot-auto-merge-forward.yml +++ /dev/null @@ -1,57 +0,0 @@ -name: Auto Merge Forward Dependabot Commits - -on: - workflow_dispatch: - -permissions: - contents: read - -concurrency: - group: dependabot-auto-merge-forward - -jobs: - get-supported-branches: - uses: spring-io/spring-security-release-tools/.github/workflows/retrieve-spring-supported-versions.yml@actions-v1 - with: - project: spring-security - type: oss - repository_name: spring-projects/spring-security - - auto-merge-forward-dependabot: - name: Auto Merge Forward Dependabot Commits - runs-on: ubuntu-latest - needs: [get-supported-branches] - permissions: - contents: write - steps: - - name: Checkout - id: checkout - uses: actions/checkout@v4 - with: - token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }} - - name: Setup GitHub User - id: setup-gh-user - run: | - git config user.name 'github-actions[bot]' - git config user.email 'github-actions[bot]@users.noreply.github.com' - - name: Run Auto Merge Forward - id: run-auto-merge-forward - uses: spring-io/spring-security-release-tools/.github/actions/auto-merge-forward@actions-v1 - with: - branches: ${{ needs.get-supported-branches.outputs.supported_versions }},main - from-author: dependabot[bot] - notify_result: - name: Check for failures - needs: [ auto-merge-forward-dependabot ] - if: failure() - runs-on: ubuntu-latest - permissions: - actions: read - steps: - - name: Send Slack message - uses: Gamesight/slack-workflow-status@v1.3.0 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - slack_webhook_url: ${{ secrets.SLACK_WEBHOOK_URL }} - channel: '#spring-security-ci' - name: 'CI Notifier' diff --git a/.github/workflows/trigger-dependabot-auto-merge-forward.yml b/.github/workflows/trigger-dependabot-auto-merge-forward.yml deleted file mode 100644 index 9bbb2ccbd5..0000000000 --- a/.github/workflows/trigger-dependabot-auto-merge-forward.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Trigger Dependabot Auto Merge Forward - -on: - push: - branches: - - '*.x' - -permissions: read-all - -jobs: - trigger-worflow: - name: Trigger Workflow - runs-on: ubuntu-latest - if: ${{ github.event.commits[0].author.username == 'dependabot[bot]' && github.repository == 'spring-projects/spring-security' }} - steps: - - name: Checkout - id: checkout - uses: actions/checkout@v4 - - id: trigger - env: - GH_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }} - run: gh workflow run dependabot-auto-merge-forward.yml -r main