From c432225ea889434ee6e56e3a7abd7f24adcee28d Mon Sep 17 00:00:00 2001 From: Phil-NHS Date: Mon, 15 Sep 2025 16:22:35 +0100 Subject: [PATCH] chore(cicd): Still not running pr failing for branch with checks --- .github/dependabot.yml | 6 ++++-- .../automerge-dependabot-prs-into-collected-branch.yml | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 4d54b00..4ecced0 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -19,7 +19,8 @@ updates: interval: "daily" open-pull-requests-limit: 100 target-branch: "Automatic_version_update_dependabot" - rebase-strategy: "auto" + # qqqq put back in once dependabot flowing automaticaly + # rebase-strategy: "auto" ignore: # The cicd for TELBlazor manages the version to consume for showcase consuming the package - dependency-name: "TELBlazor.Components" @@ -30,4 +31,5 @@ updates: interval: "daily" open-pull-requests-limit: 100 target-branch: "Automatic_version_update_dependabot" - rebase-strategy: "auto" \ No newline at end of file + # qqqq put back in once dependabot flowing automaticaly + # rebase-strategy: "auto" \ No newline at end of file diff --git a/.github/workflows/automerge-dependabot-prs-into-collected-branch.yml b/.github/workflows/automerge-dependabot-prs-into-collected-branch.yml index f66275f..298cb94 100644 --- a/.github/workflows/automerge-dependabot-prs-into-collected-branch.yml +++ b/.github/workflows/automerge-dependabot-prs-into-collected-branch.yml @@ -12,6 +12,7 @@ permissions: contents: write pull-requests: write checks: read + issues: write jobs: debug: @@ -30,6 +31,7 @@ jobs: auto-merge: runs-on: ubuntu-latest # qqqq add in after testing, and harder checks for what it is doing if: github.actor == 'dependabot[bot]' + # if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'TechnologyEnhancedLearning/TELBlazor' steps: - name: Checkout the repository uses: actions/checkout@v4