Skip to content

Commit

Permalink
Merge branch 'master' into feat/request-response-size
Browse files Browse the repository at this point in the history
  • Loading branch information
dariusc93 committed Jan 4, 2025
2 parents 91c2604 + 40550dc commit fe26bc8
Show file tree
Hide file tree
Showing 549 changed files with 21,485 additions and 11,984 deletions.
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ body:
- type: textarea
attributes:
label: Summary
description: Please provide a short summary of the bug, along with any information you feel relevant to replicate the bug.
description: Please provide a short summary of the bug, along with any information you feel is relevant to replicate the bug.
validations:
required: true
- type: textarea
Expand All @@ -34,7 +34,7 @@ body:
- type: textarea
attributes:
label: Possible Solution
description: Suggest a fix/reason for the bug, or ideas how to implement the addition or change.
description: Suggest a fix/reason for the bug, or ideas on how to implement the addition or change.
validations:
required: false
- type: textarea
Expand All @@ -45,11 +45,11 @@ body:
required: false
- type: dropdown
attributes:
label: Would you like to work on fixing this bug ?
label: Would you like to work on fixing this bug?
description: Any contribution towards fixing the bug is greatly appreciated. We are more than happy to provide help on the process.
options:
- "Yes"
- "No"
- Maybe
validations:
required: true
required: true
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
blank_issues_enabled: true
contact_links:
- name: Question
- name: Technical Questions
url: https://github.com/libp2p/rust-libp2p/discussions/new?category=q-a
about: Please ask questions in the rust-libp2p GitHub Discussions forum.
- name: Libp2p Discourse Forum
about: Please ask technical questions in the rust-libp2p GitHub Discussions forum.
- name: Community-wide libp2p Discussion
url: https://discuss.libp2p.io
about: Discussions and questions related to multiple libp2p implementations.
about: Discussions and questions about the libp2p community.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/enhancement.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ body:
required: true
- type: dropdown
attributes:
label: Are you planning to do it yourself in a pull request ?
label: Are you planning to do it yourself in a pull request?
description: Any contribution is greatly appreciated. We are more than happy to provide help on the process.
options:
- "Yes"
- "No"
- Maybe
validations:
required: true
required: true
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ body:
required: false
- type: dropdown
attributes:
label: Are you planning to do it yourself in a pull request ?
label: Are you planning to do it yourself in a pull request?
description: Any contribution is greatly appreciated. We are more than happy to provide help on the process.
options:
- "Yes"
- "No"
- Maybe
validations:
required: true
required: true
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ updates:
- "axum"
- "tower"
- "tower-http"
webrtc:
patterns:
- "rcgen"
- "webrtc"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
Expand Down
19 changes: 19 additions & 0 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,17 @@ pull_request_rules:
- base=master
actions:
queue:
name: default

# Adds the Pr to the batch queue, so that we can run the interop tests. See the `external_prs` queue for more info.
- name: Add to batch merge queue
conditions:
# All branch protection rules are implicit: https://docs.mergify.com/conditions/#about-branch-protection
- label=send-it-batch
- base=master
actions:
queue:
name: external_prs

- name: Add approved dependabot PRs to merge queue
conditions:
Expand All @@ -40,6 +51,7 @@ pull_request_rules:
- base=master
actions:
queue:
name: default

- name: Remove reviews on updates after PR is queued for merging
conditions:
Expand All @@ -59,6 +71,7 @@ pull_request_rules:
- author=@libp2p/rust-libp2p-maintainers
actions:
review:
type: APPROVE

- name: Approve dependabot PRs of semver-compatible updates
conditions:
Expand All @@ -68,7 +81,13 @@ pull_request_rules:
- title~=bump [^\s]+ from 0\.([\d]+)\..+ to 0\.\1\. # For major == 0 versions, only approve updates with the same minor version.
actions:
review:
type: APPROVE

queue_rules:
- name: default
conditions: []
# External PR's don't have access to secrets and variables, therefore they don't run the interop tests.
# using a batch queue allows to circumvent that as mergify creates it from an internal branch.
- name: external_prs
conditions: []
batch_size: 1
6 changes: 3 additions & 3 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
Please write a summary of your changes and why you made them.
This section will appear as the commit message after merging.
Please craft it accordingly.
For a quick primer on good commit mesages, check out this blog post: https://cbea.ms/git-commit/
For a quick primer on good commit messages, check out this blog post: https://cbea.ms/git-commit/
Please include any relevant issues in here, for example:
Please include any relevant issues here, for example:
Related https://github.com/libp2p/rust-libp2p/issues/ABCD.
Fixes https://github.com/libp2p/rust-libp2p/issues/XYZ.
Expand All @@ -15,7 +15,7 @@ Fixes https://github.com/libp2p/rust-libp2p/issues/XYZ.
## Notes & open questions

<!--
Any notes, remarks or open questions you have to make about the PR which don't need to go into the final commit message.
Any notes, remarks, or open questions you have to make about the PR that don't need to go into the final commit message.
-->

## Change checklist
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cache-factory.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

- uses: dtolnay/rust-toolchain@stable

- uses: Swatinem/rust-cache@3cf7f8cc28d1b4e7d01e3783be10a97d55d483c8 # v2.7.1
- uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2.7.5
with:
shared-key: stable-cache

Expand Down
Loading

0 comments on commit fe26bc8

Please sign in to comment.