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.

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

fix(www): don't try to build tun2socks when developing for the browser #1833

Merged
merged 2 commits into from
Feb 5, 2024

Conversation

daniellacosse
Copy link
Contributor

No description provided.

@daniellacosse daniellacosse requested a review from a team as a code owner February 5, 2024 21:01
Makefile Outdated
@@ -35,6 +35,9 @@ $(BUILDDIR)/apple/Tun2socks.xcframework: $(BUILDDIR)/ios/Tun2socks.xcframework $
find $^ -name "Tun2socks.framework" -type d | xargs -I {} echo " -framework {} " | \
xargs xcrun xcodebuild -create-xcframework -output "$@"

browser:
Copy link
Collaborator

Choose a reason for hiding this comment

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

Let's skip in https://github.com/Jigsaw-Code/outline-client/blob/master/src/tun2socks/build.action.mjs instead, so it doesn't even reach the make step and the per-platform dispatching is centralized in one place.

Copy link

codecov bot commented Feb 5, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (e11d99e) 40% compared to head (55402b0) 40%.

Additional details and impacted files
@@          Coverage Diff           @@
##           master   #1833   +/-   ##
======================================
  Coverage      40%     40%           
======================================
  Files          39      39           
  Lines        1805    1805           
  Branches      337     337           
======================================
  Hits          738     738           
  Misses       1067    1067           
Flag Coverage Δ
unittests 40% <ø> (ø)
www 40% <ø> (ø)

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.

@daniellacosse daniellacosse requested a review from a team as a code owner February 5, 2024 21:10
@daniellacosse daniellacosse requested a review from fortuna February 5, 2024 21:10
@daniellacosse daniellacosse merged commit 6356371 into master Feb 5, 2024
16 of 17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants