mirror of
https://github.com/sigp/lighthouse.git
synced 2026-07-03 12:54:27 +00:00
Compare commits
2 Commits
mergify/co
...
mergify-co
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
91b37bb92a | ||
|
|
a36a64322d |
19
.github/mergify.yml
vendored
19
.github/mergify.yml
vendored
@@ -12,8 +12,7 @@ pull_request_rules:
|
||||
- milestone~=v[0-9]\.[0-9]{2}
|
||||
actions:
|
||||
comment:
|
||||
message: This pull request has merge conflicts. Could you please resolve them
|
||||
@{{author}}? 🙏
|
||||
message: This pull request has merge conflicts. Could you please resolve them @{{author}}? 🙏
|
||||
label:
|
||||
add:
|
||||
- waiting-on-author
|
||||
@@ -98,17 +97,11 @@ queue_rules:
|
||||
batch_max_wait_time: 60 s
|
||||
checks_timeout: 10800 s
|
||||
merge_method: squash
|
||||
commit_message_template: |
|
||||
{{ title }} (#{{ number }})
|
||||
|
||||
{{ body | get_section("## Issue Addressed", "") }}
|
||||
|
||||
|
||||
{{ body | get_section("## Proposed Changes", "") }}
|
||||
|
||||
{% for commit in commits | unique(attribute='email_author') %}
|
||||
Co-Authored-By: {{ commit.author }} <{{ commit.email_author }}>
|
||||
{% endfor %}
|
||||
commit_message_format:
|
||||
title: pr-title
|
||||
body: pr-body
|
||||
trailers:
|
||||
- co-authored-by
|
||||
queue_conditions:
|
||||
- "#approved-reviews-by >= 1"
|
||||
- "check-success=license/cla"
|
||||
|
||||
2
Cargo.lock
generated
2
Cargo.lock
generated
@@ -2475,7 +2475,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7ab67060fc6b8ef687992d439ca0fa36e7ed17e9a0b16b25b601e8757df720de"
|
||||
dependencies = [
|
||||
"data-encoding",
|
||||
"syn 1.0.109",
|
||||
"syn 2.0.117",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
||||
@@ -108,7 +108,6 @@ impl GenericExecutionEngine for GethEngine {
|
||||
.arg(http_auth_port.to_string())
|
||||
.arg("--port")
|
||||
.arg(network_port.to_string())
|
||||
.arg("--allow-insecure-unlock")
|
||||
.arg("--authrpc.jwtsecret")
|
||||
.arg(jwt_secret_path.as_path().to_str().unwrap())
|
||||
// This flag is required to help Geth perform reliably when feeding it blocks
|
||||
|
||||
Reference in New Issue
Block a user