Skip to content

Update Android builds to use new ToyVPN #1769

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.

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

Merged
merged 25 commits into from
Apr 16, 2025
Merged

Update Android builds to use new ToyVPN #1769

merged 25 commits into from
Apr 16, 2025

Conversation

seladb
Copy link
Owner

@seladb seladb commented Apr 10, 2025

There is a new version of ToyVPN, which is a complete rewrite of the Android app using modern Android tools: https://github.com/seladb/ToyVpn-PcapPlusPlus/tree/new-toyvpn

This PR modifies PcapPlusPlus build to use the new version.

The new ToyVPN version has not yet been released. It will be released together with this PR, once approved.

with:
repository: seladb/ToyVpn-PcapPlusPlus
path: ./ToyVpn-PcapPlusPlus
ref: "new-toyvpn"
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will be removed once this PR is approved, and the new ToyVPN is released

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated in this commit: b9e9672

Copy link

codecov bot commented Apr 10, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 83.10%. Comparing base (5a261e4) to head (b9e9672).
Report is 1 commits behind head on dev.

Additional details and impacted files
@@           Coverage Diff            @@
##              dev    #1769    +/-   ##
========================================
  Coverage   83.10%   83.10%            
========================================
  Files         283      283            
  Lines       48929    48929            
  Branches    10276    10520   +244     
========================================
  Hits        40664    40664            
- Misses       7113     7125    +12     
+ Partials     1152     1140    -12     
Flag Coverage Δ
alpine320 75.08% <ø> (+0.01%) ⬆️
fedora40 75.11% <ø> (-0.04%) ⬇️
macos-13 80.60% <ø> (ø)
macos-14 80.60% <ø> (ø)
macos-15 80.58% <ø> (ø)
mingw32 70.75% <ø> (ø)
mingw64 70.71% <ø> (ø)
npcap 85.07% <ø> (ø)
rhel94 74.94% <ø> (ø)
ubuntu2004 58.53% <ø> (-0.03%) ⬇️
ubuntu2004-zstd 58.65% <ø> (-0.02%) ⬇️
ubuntu2204 74.88% <ø> (+0.02%) ⬆️
ubuntu2204-icpx 61.49% <ø> (ø)
ubuntu2404 75.11% <ø> (ø)
unittest 83.10% <ø> (ø)
windows-2019 85.09% <ø> (ø)
windows-2022 85.11% <ø> (ø)
winpcap 85.25% <ø> (ø)
xdp 50.56% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@seladb seladb marked this pull request as ready for review April 10, 2025 09:24
@seladb
Copy link
Owner Author

seladb commented Apr 13, 2025

@Dimi1010 @tigercosmos @clementperon @egecetin can someone review this PR?
We have some time urgency here because the current Android build relies on Ubuntu 20.04 which as @Dimi1010 mentioned, is going to be deprecated on April 15

working-directory: ./ToyVpn-PcapPlusPlus
run: ./gradlew build -PabiFilter=${{ matrix.target}}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this two command could be done in the same job I think

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in 9877b7c

arch: ${{ matrix.target }}
working-directory: ./ToyVpn-PcapPlusPlus
script: ./gradlew -is connectedCheck -PabiFilter=${{ matrix.target}}
# Uncomment to enable logs
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indents looks weird, but should be fine.

@seladb seladb merged commit 8f12193 into dev Apr 16, 2025
41 checks passed
@seladb seladb deleted the new-toyvpn branch April 16, 2025 06:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants