@@ -58,18 +58,16 @@ There are two main ways to develop and run Javabuilder:
58
58
### Deploying a Dev Instance
59
59
60
60
1 . Make and commit your desired changes.
61
+ 1 . Push your local changes to your feature branch.
61
62
1 . Deploy a development instance of Javabuilder, following the instructions here:
62
- [ Deploying Javabuilder] ( https://docs.google.com/document/d/1mMQK6HhniLsz9lynzhUcm7Tcw_2WVLBxADe0WzqL6rM/edit#bookmark=id.6objek4aiiu5 ) .
63
- The deployment should take around 10 minutes.
63
+ [ Deploying a Development environment] ( https://github.com/code-dot-org/javabuilder/tree/main/cicd#deploying-an-development-environment ) .
64
64
65
65
To connect your dev instance with Java Lab (Code Studio client) running on your local Dashboard server:
66
66
67
- 1 . In the code-dot-org repo, edit the ` javabuilder_url ` value in
68
- [ cdo.rb] ( https://github.com/code-dot-org/code-dot-org/blob/665a45210d556b4c3d82d6ad2434617c8e2e5ea1/lib/cdo.rb#L127 )
69
- to point to your local dev deployment (this will typically be wss://javabuilder-<your name\> .dev-code.org).
70
- 1 . Edit the ` javabuilder_upload_url ` value in
71
- [ cdo.rb] ( https://github.com/code-dot-org/code-dot-org/blob/665a45210d556b4c3d82d6ad2434617c8e2e5ea1/lib/cdo.rb#L137 )
72
- to point to your local dev HTTP upload API (this will typically be https://javabuilder- <your name\> -http.dev-code.org/seedsources/sources.json).
67
+ 1 . In your code-dot-org workspace, add an entry to your ` locals.yml ` file with your dev instance stack name:
68
+ ```
69
+ local_javabuilder_stack_name: 'javabuilder-dev-<your-branch-name>'
70
+ ```
73
71
1 . Launch dashboard using the instructions here:
74
72
https://github.com/code-dot-org/code-dot-org/blob/staging/SETUP.md#overview
75
73
1 . Navigate to any Java Lab level, for example:
@@ -78,13 +76,10 @@ To connect your dev instance with Java Lab (Code Studio client) running on your
78
76
79
77
To connect with an adhoc:
80
78
81
- 1 . Make the same changes to cdo.rb listed above.
82
- 1 . Additionally, edit the ` upgrade_insecure_requests ` list to include
83
- the deployed Javabuilder hostname.
84
- [ example] ( https://github.com/code-dot-org/code-dot-org/commit/945fa3ad38be6d85cb7c7aaeda5b3bf2e0fde60c#diff-19cc5be92c36ff06b63767f0ff922d2b9b7b9b8bebe4eaf38e0f331a14b0b528R53 )
85
- 1 . Commit your changes and deploy the adhoc using the instructions in the
79
+ 1 . Deploy the adhoc using the instructions in the
86
80
[ How to Provision an adhoc Environment] ( https://docs.google.com/document/d/1nWeQEmEQF1B2l93JTQPyeRpLEFzCzY5NdgJ8kgprcDk/edit )
87
81
document.
82
+ 1 . Add your dev instance stack name to the ` locals.yml ` on your adhoc machine like above.
88
83
1 . Navigate to any Java Lab level, for example:
89
84
http://<your-adhoc-name\> .cdn-code.org/projects/javalab/new
90
85
1 . Click the "Run" button
0 commit comments