Skip to content

Commit

Permalink
Remove internal git submodules (uber#9)
Browse files Browse the repository at this point in the history
  • Loading branch information
Tamer Eldeeb authored Feb 24, 2017
1 parent 74acbe5 commit a7d1b72
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 16 deletions.
4 changes: 0 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +0,0 @@
[submodule "cassandra"]
path = cassandra
url = gitolite@code.uber.internal:personal/nx/cassandra
branch = 3.9
12 changes: 5 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
.PHONY: bins test clean
.PHONY: test bins clean
PROJECT_ROOT = github.com/uber/cadence

export PATH := $(GOPATH)/bin:$(PATH)

THRIFT_GENDIR=.gen

# default target
default: test

# define the list of thrift files the service depends on
# (if you have some)
THRIFT_SRCS = idl/github.com/uber/cadence/cadence.thrift \
Expand All @@ -20,6 +23,7 @@ export PATH := $(GOPATH)/bin:$(PATH)

THRIFT_GEN=$(GOPATH)/bin/thrift-gen


define thriftrule
THRIFT_GEN_SRC += $(THRIFT_GENDIR)/go/$1/tchan-$1.go

Expand Down Expand Up @@ -58,9 +62,3 @@ test: bins
clean:
rm -rf .gen
rm -rf cadence



cadence: main.go \
$(wildcard config/*.go) \
$(wildcard service/*.go) \
1 change: 0 additions & 1 deletion cassandra
Submodule cassandra deleted from 9be339
4 changes: 1 addition & 3 deletions common/persistence/persistenceTestBase.go
Original file line number Diff line number Diff line change
Expand Up @@ -585,12 +585,10 @@ func (s *CassandraTestCluster) dropKeyspace() {
}

func (s *CassandraTestCluster) loadSchema(fileName string, schemaDir string) {
cqlshDir := "./cassandra/bin/cqlsh"
cqlshDir := "cqlsh"
workflowSchemaDir := "./schema/"

if schemaDir != "" {
cqlshDir = schemaDir + "/cassandra/bin/cqlsh"
log.Error(cqlshDir)
workflowSchemaDir = schemaDir + "/schema/"
}

Expand Down
1 change: 0 additions & 1 deletion go-build
Submodule go-build deleted from 181764

0 comments on commit a7d1b72

Please sign in to comment.