revert comments in makefiles

This commit is contained in:
jkoberg
2021-10-18 14:07:29 +02:00
parent 88664152e3
commit 9734c27d18
6 changed files with 10 additions and 6 deletions

View File

@@ -1,5 +1,8 @@
FROM owncloudci/golang:1.17 as build
RUN apk update && \
apk add --update npm
COPY ./ /ocis/
WORKDIR /ocis/ocis

View File

@@ -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

View File

@@ -23,7 +23,7 @@ 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:

View File

@@ -32,6 +32,7 @@ ci-go-generate: # CI runs ci-node-generate automatically before this target
.PHONY: ci-node-generate
ci-node-generate:
@npm install --global yarn
@make -C ../accounts generate
@make -C ../graph-explorer generate
@make -C ../settings generate

View File

@@ -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

View File

@@ -23,7 +23,7 @@ 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: