Skip to content
This repository was archived by the owner on Sep 20, 2024. It is now read-only.

Commit

Permalink
Merge branch 'master' into dependabot/nuget/MSTest.TestAdapter-3.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Sep 20, 2024
2 parents 3da167f + 04be020 commit 7d19f49
Show file tree
Hide file tree
Showing 2 changed files with 85 additions and 4 deletions.
83 changes: 82 additions & 1 deletion .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,89 @@
pull_request_rules:
- name: merge pull requests from dependabot if CI passes
- name: Automatically merge PRs
conditions:
- check-success=continuous-integration/travis/pr
- "#approved-reviews-by>=1"
actions:
merge:
method: merge
commit_message_template: |
Merge from {{ head }}
{{ title }} (#{{ number }})
{{ body }}
{% for user in approved_reviews_by %}
Approved-By: {{user}}
{% endfor %}
- name: Automatically Dependenabot bot's PRs
conditions:
- author=dependabot[bot]
- status-success=continuous-integration/travis/pr
actions:
merge:
method: merge
commit_message_template: |
Automerge from {{ head }}
{{ title }} (#{{ number }})
{{ body }}
- name: Automatically approve Dependenabot bot's PRs
conditions:
- author=dependabot[bot]
actions:
review:
type: APPROVE
label:
toggle:
- approved

- name: Automatic update Depenedabot pull requests if they are commits behind
conditions:
- author=dependabot[bot]
- "#commits-behind > 1"
actions:
update:

- name: Ask to resolve conflict
conditions:
- conflict
actions:
comment:
message: This pull request is now in conflict. Could you fix it @{{author}}? :)
label:
toggle:
- conflict

- name: Comment when is merged
conditions:
- merged
actions:
comment:
message: Thank you for your contribution @{{author}}! Your pull request has been merged.
label:
toggle:
- merged

- name: "Assign non Dependabot PR to author: TekuSP"
conditions:
- "#files = 1"
- "author!=dependabot[bot]"
actions:
assign:
add_users:
- "TekuSP"
label:
toggle:
- "In Review"

- name: Toggle label when CI Fails
conditions:
- check-failure=continuous-integration/travis/pr
actions:
label:
toggle:
- "CI Pipeline: Failure"
6 changes: 3 additions & 3 deletions .github/workflows/dotnet-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
runs-on: windows-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v4
with:
dotnet-version: '7.0.x'
- name: Install dependencies
Expand All @@ -23,7 +23,7 @@ jobs:
- name: Test
run: dotnet test --no-restore --verbosity normal
- name: Upload Artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: CovidPassReader-Nuget
path: |
Expand Down

0 comments on commit 7d19f49

Please sign in to comment.