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

chore(client): move outline/device and rename tun2socks to backend #1962

Closed
wants to merge 6 commits into from

Conversation

daniellacosse
Copy link
Contributor

@daniellacosse daniellacosse commented Apr 8, 2024

Note that this blocks the removal of client/src

@daniellacosse daniellacosse changed the title cleanup(client): rename client/src/tun2socks to client/src/backend and move outline/device to client/src/backend/outline/device chore(client): rename client/src/tun2socks to client/src/backend and move outline/device to client/src/backend/outline/device Apr 8, 2024
@daniellacosse daniellacosse changed the title chore(client): rename client/src/tun2socks to client/src/backend and move outline/device to client/src/backend/outline/device chore(client): move outline/device and rename tun2socks to backend Apr 8, 2024
@@ -11,7 +11,7 @@ IMPORT_PATH=$(IMPORT_HOST)/Jigsaw-Code/outline-apps

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Can move the Makefile in another PR

@daniellacosse daniellacosse marked this pull request as ready for review April 8, 2024 20:40
@daniellacosse daniellacosse requested a review from a team as a code owner April 8, 2024 20:40
Copy link
Contributor

@jyyi1 jyyi1 left a comment

Choose a reason for hiding this comment

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

Thanks, this is cleaner. The makefile seems to conflict with #1960 , you might want to sync with @fortuna on who's gonna merge first.

.github/workflows/build_and_test_debug_client.yml Outdated Show resolved Hide resolved
@@ -37,7 +37,7 @@ $(BUILDDIR)/apple/Tun2socks.xcframework: $(BUILDDIR)/ios/Tun2socks.xcframework $
XGO=$(GOBIN)/xgo
TUN2SOCKS_VERSION=v1.16.11
XGO_LDFLAGS='-w -X main.version=$(TUN2SOCKS_VERSION)'
ELECTRON_PKG="./client/src/tun2socks/outline/electron"
ELECTRON_PKG="./client/src/backend/outline/electron"
Copy link
Contributor

Choose a reason for hiding this comment

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

Please double confirm this won't change the final binary name (it should be tun2socks for Linux and tun2socks.exe for Windows).

Or maybe we should actually update it to backend and backend.exe? It's up to you.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We can do this in a later pr, I'm trying to minimize breakage.

I can't build tun2socks until @fortuna's pr fixing the xgo issue is merged. Do you mind confirming?

Copy link
Collaborator

@fortuna fortuna left a comment

Choose a reason for hiding this comment

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

Let's prioritize fixing the client first. I worry this refactoring will further break things.
Once the client is fixed and verified, we can proceed with this change.

@daniellacosse
Copy link
Contributor Author

Closing this in favor of just deleting outline/device

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.

3 participants