Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

linux_like: IPPROTO_MPTCP are supported in all linux_like platforms #3197

Merged
merged 2 commits into from Apr 23, 2023
Merged

linux_like: IPPROTO_MPTCP are supported in all linux_like platforms #3197

merged 2 commits into from Apr 23, 2023

Conversation

zonyitoo
Copy link
Contributor

@rustbot
Copy link
Collaborator

rustbot commented Apr 13, 2023

r? @JohnTitor

(rustbot has picked a reviewer for you, use r? to override)

@zonyitoo
Copy link
Contributor Author

ref shadowsocks/shadowsocks-rust#1156

@JohnTitor
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Apr 18, 2023

📌 Commit e1e3dd6 has been approved by JohnTitor

It is now in the queue for this repository.

bors added a commit that referenced this pull request Apr 18, 2023
@bors
Auto merge of #3197 - zonyitoo:master, r=JohnTitor
4d86d21 
linux_like: IPPROTO_MPTCP are supported in all linux_like platforms

`IPPROTO_MPTCP` is supported on Android.

Android: https://android.googlesource.com/platform/external/kernel-headers/+/refs/heads/master/original/uapi/linux/in.h#85
@bors
Copy link
Contributor

bors commented Apr 18, 2023

⌛ Testing commit e1e3dd6 with merge 4d86d21...

@bors
Copy link
Contributor

bors commented Apr 18, 2023

💔 Test failed - checks-actions

@zonyitoo
Copy link
Contributor Author

zonyitoo commented Apr 18, 2023 •
edited

@JohnTitor May I ask why the “homu” run failed?

Ah.. Docker Linux Tier2 (asmjs-unknown-emscripten) was failed to download nodejs. Please rerun.

@JohnTitor
Copy link
Member

@bors retry

@bors
Copy link
Contributor

bors commented Apr 18, 2023

⌛ Testing commit e1e3dd6 with merge f890344...

bors added a commit that referenced this pull request Apr 18, 2023
@bors
Auto merge of #3197 - zonyitoo:master, r=JohnTitor
f890344 
linux_like: IPPROTO_MPTCP are supported in all linux_like platforms

`IPPROTO_MPTCP` is supported on Android.

Android: https://android.googlesource.com/platform/external/kernel-headers/+/refs/heads/master/original/uapi/linux/in.h#85
@bors
Copy link
Contributor

bors commented Apr 18, 2023

💔 Test failed - checks-actions

@JohnTitor
Copy link
Member

Failed on arm-linux-androideabi:

   cargo:warning=/checkout/target/arm-linux-androideabi/debug/build/libc-test-80abdc87353bd028/out/main.c:11854:63: error: use of undeclared identifier 'IPPROTO_MPTCP'
  cargo:warning=            static const int __test_const_IPPROTO_MPTCP_val = IPPROTO_MPTCP;
  cargo:warning=                                                              ^
  cargo:warning=1 error generated.

@rustbot author

@zonyitoo
Copy link
Contributor Author

zonyitoo commented Apr 20, 2023 •
edited

IPPROTO_MPTCP was first introduced in Linux Kernel v5.6. So it would fail if the Android image in CI doesn't contain kernel > v5.6.

But the kernel in AOSP master did support this option, because it is already v6.x.

Could you upgrade the Android version in CI?

@JohnTitor
Copy link
Member

I'm more than happy if you upgrade it! But it'd be hard work (see #2955 for example) and should take some time. I'd recommend just tweaking tests for now if you need the items ASAP.

@zonyitoo
Copy link
Contributor Author

zonyitoo commented Apr 22, 2023 •
edited

All tests passed @JohnTitor

@JohnTitor
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Apr 23, 2023

📌 Commit b5fff1d has been approved by JohnTitor

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Apr 23, 2023

⌛ Testing commit b5fff1d with merge 86593ce...

@bors
Copy link
Contributor

bors commented Apr 23, 2023

☀️ Test successful - checks-actions, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13, checks-cirrus-freebsd-14
Approved by: JohnTitor
Pushing 86593ce to master...

@bors bors merged commit 86593ce into rust-lang:master Apr 23, 2023
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JohnTitor JohnTitor JohnTitor approved these changes

Assignees

@JohnTitor JohnTitor

Labels
S-waiting-on-bors
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@zonyitoo @rustbot @JohnTitor @bors