Skip to content

Commit

Permalink
Merge branch 'main' into 31660-grantInvoke
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Feb 10, 2025
2 parents e3bf26c + 775c009 commit 8caa834
Show file tree
Hide file tree
Showing 29 changed files with 35,986 additions and 44 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/request-cli-integ-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
persist-credentials: false
- name: Find changed cli files
id: changed-cli-files
uses: tj-actions/changed-files@d6e91a2266cdb9d62096cebf1e8546899c6aa18f
uses: tj-actions/changed-files@dcc7a0cba800f454d79fff4b993e8c3555bcc0a8
with:
base_sha: ${{ github.event.pull_request.base.sha }}
files_yaml: |
Expand Down
21 changes: 21 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,27 @@ pull_request_rules:
conditions:
- base!=release
- -title~=(WIP|wip)
- -label~=(blocked|do-not-merge|no-squash|two-approvers|priority-pr)
- -merged
- -closed
- author!=dependabot[bot]
- author!=dependabot-preview[bot]
- "#approved-reviews-by>=1"
- -approved-reviews-by~=author
# This is important! It makes the PR Linter work.
- "#changes-requested-reviews-by=0"
- status-success~=AWS CodeBuild us-east-1
- status-success=validate-pr
- name: automatic priority merge
actions:
comment:
message: Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to [allow changes to be pushed to your fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)).
queue:
name: priority-squash
conditions:
- base!=release
- -title~=(WIP|wip)
- label~=priority-pr
- -label~=(blocked|do-not-merge|no-squash|two-approvers)
- -merged
- -closed
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 8caa834

Please sign in to comment.