Skip to content

Commit c572030

Browse files
authored
Add support for merge queues and tweak dependabot (#68)
1 parent 43b7581 commit c572030

3 files changed

Lines changed: 10 additions & 18 deletions

File tree

.github/dependabot.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
1-
# To get started with Dependabot version updates, you'll need to specify which
2-
# package ecosystems to update and where the package manifests are located.
3-
# Please see the documentation for all configuration options:
4-
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5-
61
version: 2
72
updates:
8-
- package-ecosystem: "nuget" # See documentation for possible values
9-
directory: "/" # Location of package manifests
3+
- package-ecosystem: "nuget"
4+
directory: "/"
105
schedule:
116
interval: "daily"
12-
time: "08:00"
7+
time: "06:00"
138
timezone: "Europe/London"
149
labels:
1510
- ":game_die: dependencies"
1611
- ":robot: bot"
1712
open-pull-requests-limit: 10
1813
ignore:
19-
- dependency-name: "Moq" ## avoid Moq 4.20+
14+
## avoid Moq 4.20+
15+
- dependency-name: "Moq"
16+
## Preserve backward compatibility for library consumers
2017
- dependency-name: "FluentValidation"
2118
- dependency-name: "FluentValidation.DependencyInjectionExtensions"
19+
- dependency-name: "Microsoft.Azure.WebJobs.Extensions.OpenApi.Core"

.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
branches: [ "main" ]
66
tags: [ "**" ]
77
pull_request:
8+
merge_group:
89
workflow_dispatch:
910

1011
jobs:

.github/workflows/dependabot.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,8 @@ jobs:
1515
uses: dependabot/fetch-metadata@v1.1.1
1616
with:
1717
github-token: "${{ secrets.GITHUB_TOKEN }}"
18-
- name: Approve a PR
19-
run: gh pr review --approve "$PR_URL"
18+
- name: Enable auto squash-merge for Dependabot PRs
19+
run: gh pr merge --auto --squash "$PR_URL"
2020
env:
2121
PR_URL: ${{github.event.pull_request.html_url}}
2222
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
23-
- name: Enable auto-merge for Dependabot PRs
24-
if: ${{steps.metadata.outputs.update-type == 'version-update:semver-patch'}}
25-
run: gh pr merge --auto --merge "$PR_URL"
26-
env:
27-
PR_URL: ${{github.event.pull_request.html_url}}
28-
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
29-

0 commit comments

Comments
 (0)