Skip to content

Commit

Permalink
(v6 - #3) remove config package from this repo, use ld-relay-config i…
Browse files Browse the repository at this point in the history
…nstead (#168)
  • Loading branch information
eli-darkly authored Aug 21, 2020
1 parent 5a40979 commit 33161f5
Show file tree
Hide file tree
Showing 96 changed files with 176 additions and 2,052 deletions.
5 changes: 3 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ jobs:
CIRCLE_ARTIFACTS: /tmp/circle-artifacts
COMMON_GO_PACKAGES: >
github.com/jstemmer/go-junit-report
GOPRIVATE: github.com/launchdarkly/*-private

steps:
- checkout
- run: go get -u $COMMON_GO_PACKAGES
Expand Down Expand Up @@ -127,7 +128,7 @@ jobs:
- run: sudo apt-get update
- run: sudo apt-get install rpm
- run: make release
- run: make integration-test
- run: ./scripts/maybe-integration-test.sh
- store_artifacts:
path: dist/

Expand Down
8 changes: 8 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,11 @@ To run integration tests, such as a test of Docker deployment:
```
make integration-test
```

### Building with unreleased dependencies

LaunchDarkly uses private mirror repositories for this and other related projects. If it is necessary to temporarily redirect any dependency, such as `github.com/launchdarkly/ld-relay-config`, to the corresponding private repository during development, make sure that this environment variable is set for all local development so that builds can access non-public code:

```
GOPRIVATE="github.com/launchdarkly/*-private"
```
7 changes: 6 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ LINTER=./bin/golangci-lint

TEST_COVERAGE_REPORT_FILE ?= coverage.txt

GOPRIVATE=github.com/launchdarkly/*-private

build:
go build ./...

test:
go test -race -v ./...

Expand Down Expand Up @@ -48,4 +53,4 @@ test-centos test-debian test-docker test-docker-standalone: release

integration-test: test-centos test-debian test-docker test-docker-standalone

.PHONY: docker lint publish release test test-centos test-debian test-docker test-all test-docker-standalone
.PHONY: build docker lint publish release test test-centos test-debian test-docker test-all test-docker-standalone
2 changes: 1 addition & 1 deletion core/application/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"net/http"

"github.com/launchdarkly/ld-relay/v6/core/config"
config "github.com/launchdarkly/ld-relay-config"
"gopkg.in/launchdarkly/go-sdk-common.v2/ldlog"
)

Expand Down
253 changes: 0 additions & 253 deletions core/config/config.go

This file was deleted.

Loading

0 comments on commit 33161f5

Please sign in to comment.