File tree Expand file tree Collapse file tree 5 files changed +9
-6
lines changed Expand file tree Collapse file tree 5 files changed +9
-6
lines changed Original file line number Diff line number Diff line change @@ -132,4 +132,4 @@ jobs:
132
132
before_script :
133
133
# https://github.com/travis-ci/gimme
134
134
- eval "$(gimme)"
135
- - make -e install build
135
+ - make -e setup build
Original file line number Diff line number Diff line change @@ -49,9 +49,13 @@ cover: check-go static ## runs test suite with coverage profiling
49
49
cover-html : cover # # generates test coverage html report
50
50
$(GOCMD ) tool cover -html=$(COVER_FILE )
51
51
52
- install : check-go # # installs all dev and ci dependencies, but does not install golang
52
+ setup : check-go # # installs all dev and ci dependencies, but does not install golang
53
+ ifeq (,$(wildcard $(GOLINT ) ) )
53
54
curl -sfL https://github.com/raw/golangci/golangci-lint/master/install.sh| sh -s -- -b $(GOPATH)/bin v1.19.0
55
+ endif
56
+ ifeq (,$(wildcard $(GOPATH ) /bin/statik) )
54
57
go get github.com/rakyll/statik
58
+ endif
55
59
56
60
lint : check-go static # # runs `golangci-lint` linters defined in `.golangci.yml` file
57
61
$(GOLINT ) run --out-format=tab --tests=false ./...
Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ Installers and binary archives for most platforms can be downloaded directly fro
19
19
## Running from source (Linux / OSX)
20
20
Once Go is installed, the Optimizely Agent can be started via the following ` make ` command:
21
21
``` bash
22
- make install
22
+ make setup
23
23
make run
24
24
```
25
25
This will start the Optimizely Agent with the default configuration in the foreground.
Original file line number Diff line number Diff line change @@ -4,8 +4,7 @@ FROM golang:$GO_VERSION-alpine3.10 as builder
4
4
RUN apk add --no-cache make gcc libc-dev git
5
5
WORKDIR /go/src/github.com/optimizely/agent
6
6
COPY . .
7
- RUN make install
8
- RUN make build
7
+ RUN make setup build
9
8
10
9
FROM alpine:3.10
11
10
RUN apk add --no-cache ca-certificates=20190108-r0
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ FROM golang:$GO_VERSION as builder
3
3
4
4
WORKDIR /go/src/github.com/optimizely/agent
5
5
COPY . .
6
- RUN make install build
6
+ RUN make setup build
7
7
RUN make ci_build_static_binary
8
8
9
9
FROM scratch
You can’t perform that action at this time.
0 commit comments