mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-02-25 15:09:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

go back to where it was green

Browse Source
This commit is contained in:
jkoberg
2021-10-19 12:30:57 +02:00
parent 7e49454183
commit 2356415099
8 changed files with 12 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.make/go.mk
View File

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

4
Dockerfile
View File

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

6
accounts/Makefile
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
@@ -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 ############

5
graph-explorer/Makefile
View File

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

8
ocis/Makefile
View File

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

2
ocs/Makefile
View File

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

6
settings/Makefile
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
@@ -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 ############

5
web/Makefile
View File

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