refactor(interop): update ping to conform to the new interop spec#3423
refactor(interop): update ping to conform to the new interop spec#3423mergify[bot] merged 12 commits intomasterfrom
Conversation
This seemed to have been out of date.
Why has this not been caught earlier?
| let test_timeout = env::var("test_timeout_seconds") | ||
| .unwrap_or_else(|_| "10".into()) | ||
| .parse::<usize>()?; | ||
| .parse::<u64>()?; |
There was a problem hiding this comment.
changed from usize to u64 because of Duration::from_secs
GitHub will do it for you as soon as the branch gets deleted. They call it "automatic pull request retargeting" :) Unfortunately, it doesn't quite work as well with squash-merging because Git doesn't always detect that the new commit is based on all the old ones it already has in its history. |
|
This pull request has merge conflicts. Could you please resolve them @jxs? 🙏 |
d8b07cf to
671fbcc
Compare
|
sometimes mergify takes hours, now it took one minute 😅 this will break the CI pipeline right @thomaseizinger? UPDT: Yup it will libp2p/test-plans#121 hasn't yet been merged, sorry. Will submit a PR reverting this, or do you suggest waiting for libp2p/test-plans#121 Thomas? If so I can fix the conflicts on #3415 meanwhile, publish the image and submit a PR to UPDT #2:
wdyt? |
If the PR is green and up-to-date with the master branch, it will just merge it :D |
Description
Notes
Will switch the base to
masterwhen #3409 is merged (or anyone with editing permissions can do that)Checklist