Skip to content

Commit

Permalink
Merge pull request #1652 from habitat-sh/remove-director
Browse files Browse the repository at this point in the history
Approved by: @nobody from Nowhere
Merged by: The Sentinels
  • Loading branch information
thesentinels authored Jan 19, 2017
2 parents a9f44fc + dff0995 commit 5022783
Show file tree
Hide file tree
Showing 34 changed files with 5 additions and 2,289 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ matrix:
language: rust
env:
- COMPONENTS=bin LIBSODIUM_PREFIX=$HOME/pkgs/libsodium/1.0.8 LIBARCHIVE_PREFIX=$HOME/pkgs/libarchive/3.2.0 LIBZMQ_PREFIX=$HOME/pkgs/zeromq/4.1.4 PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$LIBARCHIVE_PREFIX/lib/pkgconfig:$LIBSODIUM_PREFIX/lib/pkgconfig:$LIBZMQ_PREFIX/lib/pkgconfig" LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIBARCHIVE_PREFIX/lib:$LIBSODIUM_PREFIX/lib:$LIBZMQ_PREFIX/lib" LIBRARY_PATH="$LIBRARY_PATH:$LIBZMQ_PREFIX/lib"
- AFFECTED_DIRS="components/director|components/hab|components/sup"
- AFFECTED_DIRS="components/hab|components/sup"
rust: stable
sudo: false
addons:
Expand Down
21 changes: 0 additions & 21 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ members = [
"components/builder-worker",
"components/common",
"components/core",
"components/director",
"components/hab",
"components/http-client",
"components/net",
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ else
docs_host := 127.0.0.1
endif

BIN = director hab hab-butterfly sup
BIN = hab hab-butterfly sup
LIB = butterfly builder-dbcache builder-core builder-protocol common core builder-depot-client http-client net
SRV = builder-api builder-admin builder-depot builder-router builder-jobsrv builder-sessionsrv builder-vault builder-worker
ALL = $(BIN) $(LIB) $(SRV)
Expand Down
20 changes: 1 addition & 19 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ target component.
$ cat build.manifest | while read entry; do echo "Building $(echo $entry | cut -d ' ' -f 1)"; build $(echo $entry | cut -d ' ' -f 2) || break; done
```

Next we will be running the same commands for hab-butterfly, hab-sup, hab-sup-static and hab-director.
Next we will be running the same commands for hab-butterfly, hab-sup, and hab-sup-static.

### Build `hab-butterfly`

Expand Down Expand Up @@ -173,24 +173,6 @@ Next we will be running the same commands for hab-butterfly, hab-sup, hab-sup-st
> cat build.manifest | while read entry; do echo "Building $(echo $entry | cut -d ' ' -f 1)"; build $(echo $entry | cut -d ' ' -f 2) || break; done
```

### Build `hab-director`

1. From outside of a studio:

```
$ cd ~/code
$ rm build.manifest
$ find core-plans habitat -name plan.sh | ./core-plans/bin/build-dependent-order.rb core/hab-director > build.manifest
```

1. From within a studio:

```
$ hab studio enter
> build habitat/components/director
> cat build.manifest | while read entry; do echo "Building $(echo $entry | cut -d ' ' -f 1)"; build $(echo $entry | cut -d ' ' -f 2) || break; done
```

## Build Mac Components

1. Ensure no pre-existing old virtual machine, then turn on and enter the system
Expand Down
50 changes: 0 additions & 50 deletions components/director/Cargo.toml

This file was deleted.

5 changes: 0 additions & 5 deletions components/director/README.md

This file was deleted.

1 change: 0 additions & 1 deletion components/director/habitat/default.toml

This file was deleted.

66 changes: 0 additions & 66 deletions components/director/habitat/plan.sh

This file was deleted.

Loading

0 comments on commit 5022783

Please sign in to comment.