Skip to content

Commit 0be2e84

Browse files
committed
Fixed configs
1 parent 4a9600a commit 0be2e84

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ jobs:
33
test:
44
docker:
55
- image: circleci/golang:1.14
6-
environment:
7-
APP_WD: "~/golang-example-app/resources"
86
working_directory: ~/golang-example-app
97
steps:
108
- checkout
9+
- run:
10+
name: "Setup APP_WD"
11+
command: echo 'export APP_WD="$(cd ${CIRCLE_WORKING_DIRECTORY}; pwd)/resources"' >> $BASH_ENV
1112
- run:
1213
name: Fetch dependencies
1314
command: go mod download
1415
- run:
1516
name: Test
16-
command: |
17-
go test ./...
17+
command: go test ./...
1818
build:
1919
docker:
2020
- image: circleci/golang:1.14

Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ define build_resources
1818
endef
1919

2020
install: init ## install cli tools
21-
export GO111MODULE=off ;\
22-
go get -v github.com/rubenv/sql-migrate/... ;\
21+
go get -v github.com/rubenv/sql-migrate/... ;\
2322
go get -u github.com/google/wire/cmd/wire ;\
2423
go get -u github.com/vektah/dataloaden ;
2524

@@ -41,7 +40,7 @@ prototool-generate: ## generate proto file
4140

4241
build: init ## build binary file
4342
$(call build_resources) ;\
44-
GO111MODULE=on GOOS=${GOOS} CGO_ENABLED=${CGO_ENABLED} GOARCH=${GOARCH} \
43+
GOOS=${GOOS} CGO_ENABLED=${CGO_ENABLED} GOARCH=${GOARCH} \
4544
go build -ldflags "-X $(GO_PKG)/cmd/version.appVersion=$(TAG)-$$(date -u +%Y%m%d%H%M)" -o "$(GO_DIR)/artifacts/bin" main.go
4645

4746
docker-image: ## build docker image

0 commit comments

Comments
 (0)