From bffa53d706f383180e6f0647f568599aa5352fd7 Mon Sep 17 00:00:00 2001 From: Peter Tripp Date: Thu, 1 May 2025 17:34:17 +0000 Subject: [PATCH] docs: Reorder macOS development documentation (#29751) Release Notes: - N/A --- docs/src/development/macos.md | 38 +++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/src/development/macos.md b/docs/src/development/macos.md index e11146e88c4a94009173eb2542232b8007b9005e..ee6930c953184043ef78a2b61c31ef9fa21c50b0 100644 --- a/docs/src/development/macos.md +++ b/docs/src/development/macos.md @@ -31,25 +31,6 @@ Clone down the [Zed repository](https://github.com/zed-industries/zed). brew install cmake ``` -## Backend Dependencies - -If you are developing collaborative features of Zed, you'll need to install the dependencies of zed's `collab` server: - -- Install [Postgres](https://postgresapp.com) -- Install [Livekit](https://formulae.brew.sh/formula/livekit) and [Foreman](https://formulae.brew.sh/formula/foreman) - - ```sh - brew install livekit foreman - ``` - -- Follow the steps in the [collab README](https://github.com/zed-industries/zed/blob/main/crates/collab/README.md) to configure the Postgres database for integration tests - -Alternatively, if you have [Docker](https://www.docker.com/) installed you can bring up all the `collab` dependencies using Docker Compose: - -```sh -docker compose up -d -``` - ## Building Zed from Source Once you have the dependencies installed, you can build Zed using [Cargo](https://doc.rust-lang.org/cargo/). @@ -72,6 +53,25 @@ And to run the tests: cargo test --workspace ``` +## Backend Dependencies + +If you are developing collaborative features of Zed, you'll need to install the dependencies of zed's `collab` server: + +- Install [Postgres](https://postgresapp.com) +- Install [Livekit](https://formulae.brew.sh/formula/livekit) and [Foreman](https://formulae.brew.sh/formula/foreman) + + ```sh + brew install livekit foreman + ``` + +- Follow the steps in the [collab README](https://github.com/zed-industries/zed/blob/main/crates/collab/README.md) to configure the Postgres database for integration tests + +Alternatively, if you have [Docker](https://www.docker.com/) installed you can bring up all the `collab` dependencies using Docker Compose: + +```sh +docker compose up -d +``` + ## Troubleshooting ### Error compiling metal shaders