b9819977a5
Includes prior-session patches (carry forward so the app compiles): - crates/gpui/build.rs: cross-compile manifest fix - crates/gpui/src/platform.rs: PlatformWindow::activate_with_token trait method - crates/gpui/src/window.rs: Window::activate_with_token public API - crates/gpui_linux/src/linux/wayland/window.rs: WaylandWindow::activate_with_token + activate() keyboard-serial fix Plus the focus-serial fix: - serial.rs: SerialKind::KeyboardEnter - client.rs: store wl_keyboard.enter serial; latest_serial_of() Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
66 lines
2.2 KiB
Markdown
66 lines
2.2 KiB
Markdown
# Zed Server
|
|
|
|
This crate is what we run at https://collab.zed.dev.
|
|
|
|
It contains our back-end logic for collaboration, to which we connect from the Zed client via a websocket after authenticating via https://zed.dev, which is a separate repo running on Vercel.
|
|
|
|
# Local Development
|
|
|
|
## Database setup
|
|
|
|
Before you can run the collab server locally, you'll need to set up a zed Postgres database. Follow the steps sequentially:
|
|
|
|
1. Ensure you have postgres installed. If not, install with `brew install postgresql@15`.
|
|
2. Follow the steps on Brew's formula and verify your `$PATH` contains `/opt/homebrew/opt/postgresql@15/bin`.
|
|
3. If you hadn't done it before, create the `postgres` user with `createuser -s postgres`.
|
|
4. You are now ready to run the `bootstrap` script:
|
|
|
|
```sh
|
|
script/bootstrap
|
|
```
|
|
|
|
This script will set up the `zed` Postgres database, and populate it with some users. It requires internet access, because it fetches some users from the GitHub API.
|
|
|
|
The script will create several _admin_ users, who you'll sign in as by default when developing locally. The GitHub logins for the default users are specified in the `seed.default.json` file.
|
|
|
|
To use a different set of admin users, create `crates/collab/seed.json`.
|
|
|
|
```json
|
|
{
|
|
"admins": ["yourgithubhere"],
|
|
"channels": ["zed"]
|
|
}
|
|
```
|
|
|
|
## Testing collaborative features locally
|
|
|
|
In one terminal, run Zed's collaboration server and the livekit dev server:
|
|
|
|
```sh
|
|
foreman start
|
|
```
|
|
|
|
In a second terminal, run two or more instances of Zed.
|
|
|
|
```sh
|
|
script/zed-local -2
|
|
```
|
|
|
|
This script starts one to four instances of Zed, depending on the `-2`, `-3` or `-4` flags. Each instance will be connected to the local `collab` server, signed in as a different user from `seed.json` or `seed.default.json`.
|
|
|
|
# Deployment
|
|
|
|
We run two instances of collab:
|
|
|
|
- Staging (https://staging-collab.zed.dev)
|
|
- Production (https://collab.zed.dev)
|
|
|
|
Both of these run on the Kubernetes cluster hosted in Digital Ocean.
|
|
|
|
Deployment is triggered by pushing to the `collab-staging` (or `collab-production`) tag in GitHub. The best way to do this is:
|
|
|
|
- `./script/deploy-collab staging`
|
|
- `./script/deploy-collab production`
|
|
|
|
You can tell what is currently deployed with `./script/what-is-deployed`.
|