Skip to content

Commit

Permalink
Merge branch 'master' of github.com:libp2p/rust-libp2p into add-upnp-…
Browse files Browse the repository at this point in the history
…protocol
  • Loading branch information
jxs committed Jul 24, 2023
2 parents 72eec83 + 293128d commit e24cc16
Show file tree
Hide file tree
Showing 47 changed files with 292 additions and 185 deletions.
17 changes: 17 additions & 0 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,14 @@ pull_request_rules:
actions:
queue:

- name: Add approved dependabot PRs to merge queue
conditions:
# All branch protection rules are implicit: https://docs.mergify.com/conditions/#about-branch-protection
- author=dependabot[bot]
- base=master
actions:
queue:

- name: Remove reviews on updates after PR is queued for merging
conditions:
- base=master
Expand All @@ -52,6 +60,15 @@ pull_request_rules:
actions:
review:

- name: Approve dependabot PRs of semver-compatible updates
conditions:
- author=dependabot[bot]
- or:
- title~=bump [^\s]+ from ([1-9]+)\..+ to \1\. # For major >= 1 versions, only approve updates with the same major version.
- title~=bump [^\s]+ from 0\.([\d]+)\..+ to 0\.\1\. # For major == 0 versions, only approve updates with the same minor version.
actions:
review:

queue_rules:
- name: default
conditions: []
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ jobs:
fail-fast: false
matrix:
rust-version: [
1.70.0, # current stable
1.71.0, # current stable
beta
]
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
echo "<meta http-equiv=\"refresh\" content=\"0; url=libp2p\">" > target/doc/index.html
cp -r target/doc/* ./host-docs
- name: Upload documentation
uses: actions/upload-pages-artifact@v1.0.9
uses: actions/upload-pages-artifact@v2.0.0
with:
path: "host-docs/"

Expand Down
Loading

0 comments on commit e24cc16

Please sign in to comment.