From feb2cea9e0159c7ea65a3258a0b3ab4d7ea1d633 Mon Sep 17 00:00:00 2001 From: jguer Date: Sat, 4 Jul 2020 23:04:40 +0200 Subject: [PATCH] fix(ci): force update --- .dockerignore | 6 ++++++ Dockerfile | 6 +++++- Makefile | 10 ++++++---- 3 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..78428867 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,6 @@ +* +!*.go +!pkg +!go.mod +!go.sum +!Makefile diff --git a/Dockerfile b/Dockerfile index 76b71df7..7b9a6bc7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,9 +4,13 @@ LABEL maintainer="Jguer,joaogg3 at google mail" WORKDIR /app -RUN pacman -Sy --overwrite=* --needed --noconfirm \ +RUN pacman -Syu --overwrite=* --needed --noconfirm \ go git +COPY go.mod . +COPY go.sum . + +RUN go mod download ENV ARCH=x86_64 COPY . . diff --git a/Makefile b/Makefile index 6846a0dd..5693f6f2 100644 --- a/Makefile +++ b/Makefile @@ -44,11 +44,14 @@ clean: $(GO) clean $(GOFLAGS) -i ./... rm -rf $(BIN) $(PKGNAME)_* +.PHONY: test_lint +test_lint: test lint + .PHONY: test test: $(GO) vet $(GOFLAGS) ./... - @test -z "$$(gofmt -l *.go)" || (echo "Files need to be linted. Use make fmt" && false) - $(GO) test $(GOFLAGS) --race -covermode=atomic . ./pkg/... + @test -z "$$(gofmt -l $(SOURCES))" || (echo "Files need to be linted. Use make fmt" && false) + $(GO) test $(GOFLAGS) ./... .PHONY: build build: $(BIN) @@ -101,8 +104,7 @@ test-vendor: vendor .PHONY: lint lint: - golangci-lint run - golint -set_exit_status . ./pkg/... + golangci-lint run ./... .PHONY: fmt fmt: