From e21561f778e6bf47db79f57c787ae19a4d8f48f0 Mon Sep 17 00:00:00 2001 From: Botond Szirtes Date: Thu, 20 Feb 2025 15:28:07 +0100 Subject: [PATCH 1/2] Enable dependabot for updating github actions Signed-off-by: Botond Szirtes --- .github/dependabot.yml | 17 +++++++++++++++++ .github/workflows/update-deployments.yaml | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..50b55a7 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,17 @@ +--- +# Set update schedule for GitHub Actions + +version: 2 +updates: + + - package-ecosystem: "github-actions" + directory: "/" + schedule: + # Check for updates to GitHub Actions every week + interval: "weekly" + groups: + gh-actions-minor: + applies-to: version-updates + update-types: + - "minor" + - "patch" diff --git a/.github/workflows/update-deployments.yaml b/.github/workflows/update-deployments.yaml index 5925bed..042f33e 100644 --- a/.github/workflows/update-deployments.yaml +++ b/.github/workflows/update-deployments.yaml @@ -6,7 +6,7 @@ on: - main jobs: update-deployments-k8s: - if: ${{ github.repository != 'networkservicemesh/cmd-template' }} + if: ${{ github.repository != 'networkservicemesh/cmd-template' && github.event.commits[0].author.name != 'dependabot[bot]' }} uses: networkservicemesh/.github/.github/workflows/update-deployments.yaml@main secrets: token: ${{ secrets.NSM_BOT_GITHUB_TOKEN }} From 339dcea47e9e98c0b7dd0758e2d97f13abef0ae5 Mon Sep 17 00:00:00 2001 From: Botond Szirtes Date: Wed, 19 Mar 2025 13:01:14 +0100 Subject: [PATCH 2/2] Adjust dependabot Signed-off-by: Botond Szirtes --- .github/dependabot.yml | 5 ++--- .github/workflows/automerge.yaml | 2 +- .github/workflows/update-deployments.yaml | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 50b55a7..f83e978 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,13 +1,10 @@ --- -# Set update schedule for GitHub Actions - version: 2 updates: - package-ecosystem: "github-actions" directory: "/" schedule: - # Check for updates to GitHub Actions every week interval: "weekly" groups: gh-actions-minor: @@ -15,3 +12,5 @@ updates: update-types: - "minor" - "patch" + commit-message: + prefix: "[github-actions] " diff --git a/.github/workflows/automerge.yaml b/.github/workflows/automerge.yaml index c40519d..3aec5cf 100644 --- a/.github/workflows/automerge.yaml +++ b/.github/workflows/automerge.yaml @@ -14,7 +14,7 @@ jobs: - uses: hmarr/debug-action@v2 check-mergeability: - if: ${{ github.event.workflow_run.conclusion == 'success' && github.actor == 'nsmbot' }} + if: ${{ github.event.workflow_run.conclusion == 'success' && (github.actor == 'nsmbot' || (github.actor == 'dependabot[bot]' && startsWith(github.event.workflow_run.head_commit.message, '[github-actions]'))) }} uses: networkservicemesh/.github/.github/workflows/check-mergeability.yaml@main secrets: token: ${{ secrets.NSM_BOT_GITHUB_TOKEN }} diff --git a/.github/workflows/update-deployments.yaml b/.github/workflows/update-deployments.yaml index 042f33e..04eaad4 100644 --- a/.github/workflows/update-deployments.yaml +++ b/.github/workflows/update-deployments.yaml @@ -6,7 +6,7 @@ on: - main jobs: update-deployments-k8s: - if: ${{ github.repository != 'networkservicemesh/cmd-template' && github.event.commits[0].author.name != 'dependabot[bot]' }} + if: ${{ github.repository != 'networkservicemesh/cmd-template' && !startsWith(github.event.commits[0].message, '[github-actions]') }} uses: networkservicemesh/.github/.github/workflows/update-deployments.yaml@main secrets: token: ${{ secrets.NSM_BOT_GITHUB_TOKEN }}