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

docs: self-managed comby dev dependency install #6902

Merged
merged 1 commit into from Nov 28, 2019
Merged

docs: self-managed comby dev dependency install #6902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions dev/comby-install-or-upgrade.sh
View file
Open in desktop
@@ -1,8 +1,8 @@
#!/usr/bin/env bash

# This function installs the comby dependency for cmd/searcher and cmd/replacer.
# The main /dev/start.sh script and CI pipeline call this script to install or
# upgrade comby for tests or development environments.
# This function installs the comby dependency for cmd/searcher and
# cmd/replacer. The CI pipeline calls this script to install or upgrade comby
# for tests or development environments.
REQUIRE_VERSION="0.11.3"

RELEASE_VERSION=$REQUIRE_VERSION
Expand Down
8 changes: 0 additions & 8 deletions dev/start.sh
View file
Open in desktop
Expand Up @@ -97,14 +97,6 @@ if ! ./dev/go-install.sh; then
exit 1
fi

# Install or upgrade comby.
# if ! ./dev/comby-install-or-upgrade.sh; then
# # Wait for everything to finish up to here.
# wait
# echo >&2 "WARNING: comby-install-or-upgrade.sh failed, some builds may have failed."
# exit 1
# fi

# Wait for yarn if it is still running
if [[ -n "$yarn_pid" ]]; then
wait "$yarn_pid"
Expand Down
8 changes: 6 additions & 2 deletions doc/dev/local_development.md
View file
Open in desktop
Expand Up @@ -37,6 +37,7 @@ Sourcegraph has the following dependencies:
- [nginx](https://docs.nginx.com/nginx/admin-guide/installing-nginx/installing-nginx-open-source/) (v1.14 or higher)
- [SQLite](https://www.sqlite.org/index.html) tools
- [Golang Migrate](https://github.com/golang-migrate/migrate/) (v4.7.0 or higher)
- [Comby](https://github.com/comby-tools/comby/) (v0.11.3 or higher)

The following are two recommendations for installing these dependencies:

Expand All @@ -51,10 +52,10 @@ The following are two recommendations for installing these dependencies:
brew cask install docker
```

3. Install Go, Node, PostgreSQL, Redis, Git, nginx, golang-migrate, and SQLite tools with the following command:
3. Install Go, Node, PostgreSQL, Redis, Git, nginx, golang-migrate, Comby, and SQLite tools with the following command:

```bash
brew install go node yarn redis postgresql git gnu-sed nginx golang-migrate sqlite pcre FiloSottile/musl-cross/musl-cross
brew install go node yarn redis postgresql git gnu-sed nginx golang-migrate comby sqlite pcre FiloSottile/musl-cross/musl-cross
```

4. Configure PostgreSQL and Redis to start automatically
Expand Down Expand Up @@ -110,6 +111,9 @@ The following are two recommendations for installing these dependencies:

# install golang-migrate (you must move the extracted binary into your $PATH)
curl -L https://github.com/golang-migrate/migrate/releases/download/v4.7.0/migrate.linux-amd64.tar.gz | tar xvz

# install comby (you must move the extracted binary into your $PATH)
curl -L https://github.com/comby-tools/comby/releases/download/0.11.3/comby-0.11.3-x86_64-linux.tar.gz | tar xvz
```

4. Configure startup services
Expand Down