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

chore(client/electron): move src/electron into client/electron #1958

Merged
merged 23 commits into from
May 8, 2024
Merged

chore(client/electron): move src/electron into client/electron #1958

merged 23 commits into from
May 8, 2024

Conversation

daniellacosse
Copy link
Contributor

@daniellacosse daniellacosse commented Apr 5, 2024 •
edited
Loading

also gets rid the client/tools folder (the android setup script is now in the CI)
also moves all the client electron build outputs to a root output/client/electron folder:
Screenshot 2024-04-23 at 11 50 25 AM

@github-actions github-actions bot added the size/S label Apr 5, 2024
@github-actions github-actions bot added size/M and removed size/S labels Apr 10, 2024
@daniellacosse daniellacosse marked this pull request as ready for review April 10, 2024 15:10
@daniellacosse daniellacosse requested review from a team as code owners April 10, 2024 15:10
fortuna
fortuna requested changes Apr 10, 2024
View reviewed changes
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.

Same comment as the other PR. No more refactoring until the client is fixed. Otherwise we can't tell if this is further breaking things.

fortuna
fortuna requested changes Apr 12, 2024
View reviewed changes
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.

We are doing too many unnecessary moves. We need a different approach. When you move code, please move to their final destinations, so others can work on the code without conflicting further with the refactoring.

client/src/electron/README.md Outdated Show resolved Hide resolved
client/src/electron/build.action.mjs Outdated Show resolved Hide resolved
package.json Outdated Show resolved Hide resolved
client/tools/OutlineService/OutlineService.sln Outdated Show resolved Hide resolved
client/src/www/app/electron_main.ts Outdated Show resolved Hide resolved
@daniellacosse daniellacosse reopened this Apr 19, 2024
@daniellacosse daniellacosse marked this pull request as draft April 19, 2024 20:00
@github-actions github-actions bot added size/XL and removed size/M labels Apr 19, 2024
@daniellacosse daniellacosse changed the title chore(client/electron): move src/electron into client/src/electron chore(client/electron): move src/electron into client/electron Apr 23, 2024
@github-actions github-actions bot added size/L and removed size/XL labels Apr 23, 2024
@daniellacosse daniellacosse marked this pull request as ready for review April 23, 2024 17:51
@daniellacosse daniellacosse requested a review from jyyi1 May 6, 2024 13:37
jyyi1
jyyi1 approved these changes May 8, 2024
View reviewed changes
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.

Verified it in Windows 10, all good. We only need to update some paths in the documentation.

client/electron/README.md Outdated Show resolved Hide resolved
client/electron/README.md Outdated Show resolved Hide resolved
@daniellacosse daniellacosse enabled auto-merge (squash) May 8, 2024 20:36
daniellacosse and others added 23 commits May 8, 2024 16:38
@daniellacosse
chore(client/electron): move src/electron into client/src/electron
573c0c6
@daniellacosse
that fuggin worked holy shoot
25d29d4
@daniellacosse
remove environment.json
13d38f0
@daniellacosse @jyyi1
Update client/src/electron/electron-builder.json
bcbc924 
Co-authored-by: J. Yi <93548144+jyyi1@users.noreply.github.com>
@daniellacosse
wuzziz
6814a21
@daniellacosse
move electron to client root
27b100c
@daniellacosse
force electron resolution
21242d3
@daniellacosse
helpful comment
9606db8
@daniellacosse
ah, it needs to be in both lol
e3e9c5a
@daniellacosse
hell yeah!
4a08d17
@daniellacosse
some nudges
0702a7a
@daniellacosse
don't need to clean build anymore
05a363d
@daniellacosse
restore ci setup script
132273f
@daniellacosse
huh, mismatch between vscode and the cli
848817d
@daniellacosse
put back lookupIP
8623578
@daniellacosse
correct run action import
c908faa
@daniellacosse
oops lol
824565f
@daniellacosse
i think the asar unpack was causing the problem
cae5226
@daniellacosse
update windows path
0dede1d
@daniellacosse
fix asar unpacked
c334a58
@daniellacosse
fix in progress
1be019d
@daniellacosse
update readme link
89e4f2e
@daniellacosse
update readme paths
1fe094c
@daniellacosse daniellacosse merged commit 2f174c1 into master May 8, 2024
16 of 17 checks passed
@daniellacosse daniellacosse deleted the daniellacosse/move_electron branch May 8, 2024 20:41
@sbruens sbruens mentioned this pull request May 23, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jyyi1 jyyi1 jyyi1 approved these changes

@fortuna fortuna fortuna approved these changes

Assignees
No one assigned
Labels
size/XL
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@daniellacosse @fortuna @jyyi1