From 23564150999d334353d4f4d3ee5d3a37383242de Mon Sep 17 00:00:00 2001 From: jkoberg Date: Tue, 19 Oct 2021 12:30:57 +0200 Subject: [PATCH] go back to where it was green --- .make/go.mk | 2 +- Dockerfile | 4 ---- accounts/Makefile | 6 ++---- graph-explorer/Makefile | 5 +---- ocis/Makefile | 8 ++++---- ocs/Makefile | 2 +- settings/Makefile | 6 ++---- web/Makefile | 5 +---- 8 files changed, 12 insertions(+), 26 deletions(-) diff --git a/.make/go.mk b/.make/go.mk index 25d343f53e..bd3730b219 100644 --- a/.make/go.mk +++ b/.make/go.mk @@ -77,7 +77,7 @@ ci-golangci-lint: $(GOLANGCI_LINT) $(GOLANGCI_LINT) run -E gosec -E bodyclose -E dogsled -E durationcheck -E revive -E ifshort -E makezero -E prealloc -E predeclared --path-prefix $(NAME) --timeout 10m0s --issues-exit-code 0 --out-format checkstyle > checkstyle.xml .PHONY: test -test: ci-node-generate +test: @go test -v -coverprofile coverage.out ./... .PHONY: go-coverage diff --git a/Dockerfile b/Dockerfile index 5a8b197ae6..5b3531133f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,5 @@ FROM owncloudci/golang:1.17 as build -RUN apk update && \ - apk add --update npm - COPY ./ /ocis/ WORKDIR /ocis/ocis @@ -14,7 +11,6 @@ FROM alpine:3.13 RUN apk update && \ apk upgrade && \ apk add ca-certificates mailcap && \ - apk add --update npm && \ rm -rf /var/cache/apk/* && \ echo 'hosts: files dns' >| /etc/nsswitch.conf diff --git a/accounts/Makefile b/accounts/Makefile index fa73e25a21..92d01381b5 100644 --- a/accounts/Makefile +++ b/accounts/Makefile @@ -31,8 +31,8 @@ docs-generate: config-docs-generate \ include ../.make/generate.mk .PHONY: ci-go-generate -ci-go-generate: protobuf # CI runs ci-node-generate automatically before this target - @go generate ./... +ci-go-generate: # protobuf # CI runs ci-node-generate automatically before this target + # @go generate ./... .PHONY: ci-node-generate ci-node-generate: yarn-build @@ -45,8 +45,6 @@ yarn-build: node_modules .PHONY: node_modules node_modules: - apk add npm - npm install --global yarn yarn install --frozen-lockfile ############ protobuf ############ diff --git a/graph-explorer/Makefile b/graph-explorer/Makefile index 076c9d566d..622172c8a4 100644 --- a/graph-explorer/Makefile +++ b/graph-explorer/Makefile @@ -23,13 +23,10 @@ include ../.make/generate.mk .PHONY: ci-go-generate ci-go-generate: pull-assets # CI runs ci-node-generate automatically before this target - @go generate ./... + # @go generate ./... .PHONY: ci-node-generate ci-node-generate: - apk add npm - npm install --global yarn - yarn install --frozen-lockfile .PHONY: pull-assets pull-assets: diff --git a/ocis/Makefile b/ocis/Makefile index f61615e203..b610e49fc4 100644 --- a/ocis/Makefile +++ b/ocis/Makefile @@ -32,7 +32,7 @@ ci-go-generate: # CI runs ci-node-generate automatically before this target .PHONY: ci-node-generate ci-node-generate: - @make -C ../accounts ci-node-generate - @make -C ../graph-explorer ci-node-generate - @make -C ../settings ci-node-generate - @make -C ../web ci-node-generate + @make -C ../accounts generate + @make -C ../graph-explorer generate + @make -C ../settings generate + @make -C ../web generate diff --git a/ocs/Makefile b/ocs/Makefile index f64c8b62a2..f1e17ccca2 100644 --- a/ocs/Makefile +++ b/ocs/Makefile @@ -27,4 +27,4 @@ ci-go-generate: # CI runs ci-node-generate automatically before this target .PHONY: ci-node-generate ci-node-generate: - @make -C ../accounts ci-node-generate + @make -C ../accounts generate diff --git a/settings/Makefile b/settings/Makefile index 58a2411023..16e9f8184d 100644 --- a/settings/Makefile +++ b/settings/Makefile @@ -32,8 +32,8 @@ docs-generate: config-docs-generate \ include ../.make/generate.mk .PHONY: ci-go-generate -ci-go-generate: protobuf # CI runs ci-node-generate automatically before this target - @go generate ./... +ci-go-generate: #protobuf # CI runs ci-node-generate automatically before this target + #@go generate ./... .PHONY: ci-node-generate ci-node-generate: yarn-build @@ -46,8 +46,6 @@ yarn-build: node_modules .PHONY: node_modules node_modules: - apk add npm - npm install --global yarn yarn install --frozen-lockfile ############ protobuf ############ diff --git a/web/Makefile b/web/Makefile index f96966e251..defc926d6d 100644 --- a/web/Makefile +++ b/web/Makefile @@ -23,13 +23,10 @@ include ../.make/generate.mk .PHONY: ci-go-generate ci-go-generate: pull-assets # CI runs ci-node-generate automatically before this target - @go generate ./... + # @go generate ./... .PHONY: ci-node-generate ci-node-generate: - apk add npm - npm install --global yarn - yarn install --frozen-lockfile WEB_ASSETS_VERSION = v4.3.0