Skip to content

Commit df1e83e

Browse files
nithyanatarajanjskswamy
authored andcommitted
Ensure vendor directory is present during compile, test and in pipeline
1 parent a9b4c76 commit df1e83e

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ jobs:
1212
go-version: 1.16.x
1313
- name: Checkout code
1414
uses: actions/checkout@v2
15+
- name: Generate vendor directory
16+
run: make ensure-vendor
1517
- name: Lint
1618
run: make lint
1719
- name: Secure dockerfile

Makefile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ all: setup build
5454
ensure-build-dir:
5555
mkdir -p out
5656

57+
ensure-vendor:
58+
go mod vendor
59+
5760
build-deps: ## Install dependencies
5861
go get
5962
go mod tidy
@@ -62,13 +65,13 @@ build-deps: ## Install dependencies
6265
update-deps: ## Update dependencies
6366
go get -u
6467

65-
compile: ensure-build-dir ## Compile dobby
68+
compile: ensure-build-dir ensure-vendor## Compile dobby
6669
$(GO_BINARY) build -ldflags "-X main.majorVersion=$(VERSION) -X main.minorVersion=${BUILD}" -o $(APP_EXECUTABLE) ./main.go
6770

6871
run: compile ## Run dobby
6972
./out/dobby server
7073

71-
compile-linux: ensure-build-dir ## Compile dobby for linux
74+
compile-linux: ensure-build-dir ensure-vendor ## Compile dobby for linux
7275
GOOS=linux GOARCH=amd64 $(GO_BINARY) build -ldflags "-X main.majorVersion=$(VERSION) -X main.minorVersion=${BUILD}" -o $(APP_EXECUTABLE) ./main.go
7376

7477
build: build-deps fmt lint test compile ## Build the application
@@ -82,7 +85,7 @@ fmt:
8285
lint: setup-golangci-lint
8386
$(GOLANGCI_LINT) run -v
8487

85-
test: ensure-build-dir ## Run tests
88+
test: ensure-build-dir ensure-vendor ## Run tests
8689
ENVIRONMENT=test $(GO_BINARY) test $(SRC_PACKAGES) -p=1 -coverprofile ./out/coverage -short -v | grep -viE "start|no test files"
8790

8891
test-cover-html: ## Run tests with coverage

0 commit comments

Comments
 (0)