chore(manager): move the manager and rename the repository to `outline_apps` #1834

daniellacosse · 2024-02-06T04:35:00Z

This way we'll be able to share web code and build scripts, and tools between the projects (like the storybook!)

I also have a draft PR up that moves the client into its own folder! #1838

server_manager/electron_app/fetch.ts

server_manager/electron_app/gcp_oauth.ts

codecov · 2024-02-06T04:37:33Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (6356371) 32% compared to head (b7fb05a) 32%.

Additional details and impacted files

@@          Coverage Diff           @@
##           master   #1834   +/-   ##
======================================
  Coverage      32%     32%           
======================================
  Files          45      45           
  Lines        2609    2609           
  Branches      337     337           
======================================
  Hits          859     859           
  Misses       1750    1750

Flag	Coverage Δ
apple	`15% <ø> (ø)`
maccatalyst	`15% <ø> (ø)`
macos	`15% <ø> (ø)`
unittests	`32% <ø> (ø)`
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.

…node script

fortuna · 2024-02-15T16:37:16Z

server_manager/install_scripts/install_server.sh

The Manager refers to the install script in the outline-server repo. You must update that reference. We also need to update any docs we have referring to the install script location.

After the move, we should probably update the script in the original location with an error saying where the new script it.

Sorry, where is it referenced in here? I can't seem to find it. Or are you saying this script should remain in the server repo?

See https://github.com/search?q=repo%3AJigsaw-Code%2Foutline-server%20install_script&type=code

Most critically, we have it on the UI: https://github.com/Jigsaw-Code/outline-server/blob/a62b25b54cf97770645d3fb601f601d2c92006be/src/server_manager/web_app/ui_components/outline-manual-server-entry.ts#L328

So we will have to keep it there for some time until everyone migrate. But also update all the docs and references.

fortuna · 2024-02-15T16:38:22Z

server_manager/install_scripts/install_server.sh

We probably want to double check if this contains all the latest changes to the scripts.

fortuna

Of the files you are adding, which ones did you modify from the original? It's impossible to tell without a diff.

Also, please make sure you included all the recent changes:
https://github.com/Jigsaw-Code/outline-server/pulls?q=is%3Apr+is%3Aclosed

fortuna · 2024-02-15T17:08:21Z

.gitignore

@@ -26,3 +27,5 @@ tools/smartdnsblock/bin/*
 !tools/smartdnsblock/bin/*.exe
 universal.apk
 xcuserdata/
+do_install_script.ts


Is this in the root?

I'd rather keep the .gitignore localized in the respective folder. Create the file there instead.

if you omit the slash, it ignores anything called do_install_script.ts - I'll make it more specific

Please create a .gitignore in the directory where do_install_script.ts is created, so it's localized there.
I'd say same for /server_manager to ignore the node_modules.

It's easier to manage these if they are in context.

Sure, I prefer that, even

package.json

daniellacosse · 2024-02-15T18:12:25Z

Of the files you are adding, which ones did you modify from the original? It's impossible to tell without a diff.

Also, please make sure you included all the recent changes: https://github.com/Jigsaw-Code/outline-server/pulls?q=is%3Apr+is%3Aclosed

Sure, let me create a couple diffs.

daniellacosse · 2024-02-15T18:44:22Z

Of the files you are adding, which ones did you modify from the original? It's impossible to tell without a diff.
Also, please make sure you included all the recent changes: https://github.com/Jigsaw-Code/outline-server/pulls?q=is%3Apr+is%3Aclosed

Sure, let me create a couple diffs.

migration.zip

fair warning, this isn't too helpful either, as the format hook here is different than that of the manager - most of it is formatting changes

daniellacosse · 2024-02-15T18:48:08Z

Of the files you are adding, which ones did you modify from the original? It's impossible to tell without a diff.

Also, please make sure you included all the recent changes: https://github.com/Jigsaw-Code/outline-server/pulls?q=is%3Apr+is%3Aclosed

btw, turns out outline-i18n isn't used in the manager: https://github.com/search?q=repo%3AJigsaw-Code%2Foutline-server%20outline-i18n&type=code

also, do you mind if I catch up the changes in a follow up PR? otherwise I'll keep having to play catch up as we make changes to the move. we can do the catch up, rename this repo, and delete the manager from the other repo live as a team.

sbruens · 2024-02-15T19:05:57Z

Could we block further merges on the manager?

daniellacosse · 2024-02-15T23:06:21Z

Could we block further merges on the manager?

Like, just not merge anything that touches the manager? Or write a check to enforce that?

fortuna

I really need to know which, of the added files, you edited, so I know what to review.

fortuna · 2024-02-16T00:21:02Z

.gitignore

@@ -26,3 +27,5 @@ tools/smartdnsblock/bin/*
 !tools/smartdnsblock/bin/*.exe
 universal.apk
 xcuserdata/
+do_install_script.ts


Please create a .gitignore in the directory where do_install_script.ts is created, so it's localized there.
I'd say same for /server_manager to ignore the node_modules.

It's easier to manage these if they are in context.

fortuna · 2024-02-16T00:22:10Z

By the way, were you able to successfully run the manager and create a server?

daniellacosse · 2024-02-16T00:25:48Z

I really need to know which, of the added files, you edited, so I know what to review.

I have an idea - I can run our formatter against the server repo and then do the diff after that. First I will fix the install script and confirm I can create a server

sbruens · 2024-02-16T00:32:15Z

Could we block further merges on the manager?

Like, just not merge anything that touches the manager? Or write a check to enforce that?

I don't think we need to formalize it with a check, we're small enough to manage that informally? Unless it's easy to configure in GitHub somehow.

daniellacosse · 2024-02-16T00:38:48Z

Could we block further merges on the manager?

Like, just not merge anything that touches the manager? Or write a check to enforce that?

I don't think we need to formalize it with a check, we're small enough to manage that informally? Unless it's easy to configure in GitHub somehow.

@jyyi1 fyi

fortuna · 2024-02-16T22:33:12Z

@daniellacosse I just need to know the places where you changed code, ignore formatting.
For sure you had to edit some files to make the code work. We need to know what you had to modify.

If you had branches after the copy, but before and after the changes, it would be ideal. Otherwise, knowing the files you changed would help.

BTW, the PR title needs to be updated.

daniellacosse · 2024-02-21T18:10:40Z

@daniellacosse I just need to know the places where you changed code, ignore formatting. For sure you had to edit some files to make the code work. We need to know what you had to modify.

If you had branches after the copy, but before and after the changes, it would be ideal. Otherwise, knowing the files you changed would help.

BTW, the PR title needs to be updated.

I hear you, I just already forgot what I modified. The formatting occurs in the git hook, so there's no unformatted state. Let me crawl through the commits to try to jog my memory.

daniellacosse · 2024-02-21T18:23:04Z

@daniellacosse I just need to know the places where you changed code, ignore formatting. For sure you had to edit some files to make the code work. We need to know what you had to modify.

If you had branches after the copy, but before and after the changes, it would be ideal. Otherwise, knowing the files you changed would help.

BTW, the PR title needs to be updated.

Okay @fortuna, I think in the first commit I just copied everything over, and in the subsequent commits I got it to work. In those commits:

I created .github/workflows/build_and_test_debug_manager.yml
I updated various paths and imports in the following:

server_manager/base.webpack.js
server_manager/electron_app/build.action.sh
server_manager/electron_app/package.action.sh
server_manager/electron_app/start.action.sh
server_manager/electron_main.webpack.mjs
server_manager/electron_preload.webpack.mjs
server_manager/web_app/build_install_script.action.sh
server_manager/web_app/build.action.sh
server_manager/web_app/outline-gcp-create-server-app.ts
server_manager/web_app/start.action.sh
server_manager/web_app/ui_components/outline-server-list.ts

I updated dependencies and rules in these:

server_manager/package.json
server_manager/tsconfig.json

fortuna

Looks good. Thanks for the diff, I took a look at the most relevant files that changed and all looks good.

Please make sure the app still works with no runtime errors.

fortuna · 2024-02-21T19:02:29Z

server_manager/tsconfig.json

@@ -0,0 +1,24 @@
+{


This seems to match the original behavior. We should consider factoring out the common settings across projects at some point, like we have in outline-server.

chore(manager): move the manager

b510c6c

github-actions bot added the size/XXL label Feb 6, 2024

github-advanced-security bot found potential problems Feb 6, 2024

View reviewed changes

server_manager/electron_app/fetch.ts Dismissed Show resolved Hide resolved

server_manager/electron_app/gcp_oauth.ts Dismissed Show dismissed Hide dismissed

daniellacosse changed the title ~~proposal(manager): move the manager~~ proposal(manager): move the manager and rename the repository to outline-apps Feb 6, 2024

daniellacosse changed the title ~~proposal(manager): move the manager and rename the repository to outline-apps~~ proposal(manager): move the manager and rename the repository to outline-frontend Feb 6, 2024

daniellacosse added manager needs discussion labels Feb 6, 2024

daniellacosse added 2 commits February 5, 2024 23:52

fix commit message, redunant task names, and replace run_action with …

af31468

…node script

differentiate concurrency groups

a9e9834

daniellacosse requested a review from fortuna February 6, 2024 04:58

daniellacosse added 2 commits February 6, 2024 00:22

works up to the build - need to more carefully merge package jsons

23a0012

try THIS

5ad6c9b

daniellacosse changed the title ~~proposal(manager): move the manager and rename the repository to outline-frontend~~ proposal(manager): move the manager and rename the repository to outline-apps Feb 7, 2024

daniellacosse added 9 commits February 7, 2024 14:04

we don't... need this?

db25255

try to speed up npm?

f56cfe8

build windows on linux

8f42fbd

that no worky lol

c51d52a

try npm set cache

616964e

remove --prod :/

39836ea

prefer offline

753e772

clean up

7368428

eh, nah

e440fa1

daniellacosse removed the needs discussion label Feb 7, 2024

daniellacosse marked this pull request as ready for review February 7, 2024 21:01

daniellacosse requested a review from a team as a code owner February 7, 2024 21:01

daniellacosse mentioned this pull request Feb 12, 2024

chore(client): move the client to its own subfolder #1838

Closed

8 tasks

fortuna reviewed Feb 15, 2024

View reviewed changes

fortuna self-requested a review February 15, 2024 16:39

fortuna reviewed Feb 15, 2024

View reviewed changes

make install scripts more specific

b7fb05a

daniellacosse changed the title ~~proposal(manager): move the manager and rename the repository to outline-apps~~ proposal(manager): move the manager and rename the repository to outline_apps Feb 15, 2024

fortuna reviewed Feb 16, 2024

View reviewed changes

daniellacosse changed the title ~~proposal(manager): move the manager and rename the repository to outline_apps~~ chore(manager): move the manager and rename the repository to outline_apps Feb 21, 2024

fortuna approved these changes Feb 21, 2024

View reviewed changes

daniellacosse merged commit 81abbb9 into master Feb 21, 2024
29 of 30 checks passed

sbruens mentioned this pull request Jul 25, 2024

chore(devtools/build): remove unused jsign files Jigsaw-Code/outline-server#1569

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore(manager): move the manager and rename the repository to `outline_apps` #1834

chore(manager): move the manager and rename the repository to `outline_apps` #1834

daniellacosse commented Feb 6, 2024 •

edited

Loading

codecov bot commented Feb 6, 2024 •

edited

Loading

fortuna Feb 15, 2024

daniellacosse Feb 15, 2024

fortuna Feb 16, 2024

fortuna Feb 15, 2024

fortuna left a comment

fortuna Feb 15, 2024 •

edited

Loading

daniellacosse Feb 15, 2024

fortuna Feb 16, 2024

daniellacosse Feb 16, 2024

daniellacosse commented Feb 15, 2024

daniellacosse commented Feb 15, 2024 •

edited

Loading

daniellacosse commented Feb 15, 2024

sbruens commented Feb 15, 2024

daniellacosse commented Feb 15, 2024

fortuna left a comment

fortuna Feb 16, 2024

fortuna commented Feb 16, 2024

daniellacosse commented Feb 16, 2024

sbruens commented Feb 16, 2024

daniellacosse commented Feb 16, 2024

fortuna commented Feb 16, 2024

daniellacosse commented Feb 21, 2024

daniellacosse commented Feb 21, 2024

fortuna left a comment

fortuna Feb 21, 2024

chore(manager): move the manager and rename the repository to outline_apps #1834

chore(manager): move the manager and rename the repository to outline_apps #1834

Conversation

daniellacosse commented Feb 6, 2024 • edited Loading

codecov bot commented Feb 6, 2024 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fortuna left a comment

Choose a reason for hiding this comment

fortuna Feb 15, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

daniellacosse commented Feb 15, 2024

daniellacosse commented Feb 15, 2024 • edited Loading

daniellacosse commented Feb 15, 2024

sbruens commented Feb 15, 2024

daniellacosse commented Feb 15, 2024

fortuna left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fortuna commented Feb 16, 2024

daniellacosse commented Feb 16, 2024

sbruens commented Feb 16, 2024

daniellacosse commented Feb 16, 2024

fortuna commented Feb 16, 2024

daniellacosse commented Feb 21, 2024

daniellacosse commented Feb 21, 2024

fortuna left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

chore(manager): move the manager and rename the repository to `outline_apps` #1834

chore(manager): move the manager and rename the repository to `outline_apps` #1834

daniellacosse commented Feb 6, 2024 •

edited

Loading

codecov bot commented Feb 6, 2024 •

edited

Loading

fortuna Feb 15, 2024 •

edited

Loading

daniellacosse commented Feb 15, 2024 •

edited

Loading