diff --git a/.drone.star b/.drone.star index 47ed252f6..1db2bc96d 100644 --- a/.drone.star +++ b/.drone.star @@ -188,7 +188,7 @@ def main(ctx): test_pipelines = \ cancelPreviousBuilds() + \ - [goLicenseCheck(ctx)] + \ + [licenseCheck(ctx)] + \ [buildOcisBinaryForTesting(ctx)] + \ testOcisModules(ctx) + \ testPipelines(ctx) @@ -380,7 +380,7 @@ def buildOcisBinaryForTesting(ctx): "volumes": [pipelineVolumeGo], } -def goLicenseCheck(ctx): +def licenseCheck(ctx): return { "kind": "pipeline", "type": "docker", @@ -392,18 +392,32 @@ def goLicenseCheck(ctx): "steps": skipIfUnchanged(ctx, "go-mod") + [ { - "name": "check-go-license", + "name": "node-check-licenses", + "image": OC_CI_NODEJS, + "commands": [ + "make ci-node-check-licenses", + ], + }, + { + "name": "node-save-licenses", + "image": OC_CI_NODEJS, + "commands": [ + "make ci-node-save-licenses", + ], + }, + { + "name": "go-check-licenses", "image": OC_CI_GOLANG, "commands": [ - "make check-go-licenses", + "make ci-go-check-licenses", ], "volumes": [stepVolumeGo], }, { - "name": "save-go-licenses", + "name": "go-save-licenses", "image": OC_CI_GOLANG, "commands": [ - "make save-go-licenses", + "make ci-go-save-licenses", ], "volumes": [stepVolumeGo], }, @@ -1756,7 +1770,7 @@ def skipIfUnchanged(ctx, type): ] go_mod = [ "^go.mod", - "^go.sum" + "^go.sum", ] skip = [] diff --git a/Makefile b/Makefile index af8928d79..5c6901306 100644 --- a/Makefile +++ b/Makefile @@ -187,7 +187,7 @@ ci-go-check-licenses: $(GO_LICENSES) .PHONY: ci-node-check-licenses ci-node-check-licenses: @for mod in $(OCIS_MODULES); do \ - @$(MAKE) --no-print-directory -C $$mod ci-node-check-licenses || exit 1; \ + $(MAKE) --no-print-directory -C $$mod ci-node-check-licenses || exit 1; \ done .PHONY: ci-go-save-licenses @@ -199,7 +199,7 @@ ci-go-save-licenses: $(GO_LICENSES) .PHONY: ci-node-save-licenses ci-node-save-licenses: @for mod in $(OCIS_MODULES); do \ - @$(MAKE) --no-print-directory -C $$mod ci-node-save-licenses || exit 1; \ + $(MAKE) --no-print-directory -C $$mod ci-node-save-licenses || exit 1; \ done CHANGELOG_VERSION = diff --git a/accounts/Makefile b/accounts/Makefile index c7b6a1488..52698cda9 100644 --- a/accounts/Makefile +++ b/accounts/Makefile @@ -46,7 +46,7 @@ yarn-build: node_modules .PHONY: node_modules node_modules: - yarn install --immutable + @yarn install --immutable 2>&1 >/dev/null ############ protobuf ############ include ../.make/protobuf.mk @@ -55,11 +55,11 @@ include ../.make/protobuf.mk protobuf: buf-generate ############ licenses ############ -.PHONY: ci-node-licenses-check -ci-node-licenses-check: +.PHONY: ci-node-check-licenses +ci-node-check-licenses: node_modules yarn licenses:check -.PHONY: ci-node-licenses-save -ci-node-licenses-save: +.PHONY: ci-node-save-licenses +ci-node-save-licenses: node_modules yarn licenses:csv yarn licenses:save diff --git a/audit/Makefile b/audit/Makefile index d6ef3279f..c95031e52 100644 --- a/audit/Makefile +++ b/audit/Makefile @@ -30,8 +30,8 @@ ci-go-generate: # CI runs ci-node-generate automatically before this target ci-node-generate: ############ licenses ############ -.PHONY: ci-node-licenses-check -ci-node-licenses-check: +.PHONY: ci-node-check-licenses +ci-node-check-licenses: -.PHONY: ci-node-licenses-save -ci-node-licenses-save: +.PHONY: ci-node-save-licenses +ci-node-save-licenses: diff --git a/glauth/Makefile b/glauth/Makefile index c564ed29b..534484c5c 100644 --- a/glauth/Makefile +++ b/glauth/Makefile @@ -30,8 +30,8 @@ ci-go-generate: # CI runs ci-node-generate automatically before this target ci-node-generate: ############ licenses ############ -.PHONY: ci-node-licenses-check -ci-node-licenses-check: +.PHONY: ci-node-check-licenses +ci-node-check-licenses: -.PHONY: ci-node-licenses-save -ci-node-licenses-save: +.PHONY: ci-node-save-licenses +ci-node-save-licenses: diff --git a/graph-explorer/Makefile b/graph-explorer/Makefile index c7b755bd8..744b55ae9 100644 --- a/graph-explorer/Makefile +++ b/graph-explorer/Makefile @@ -33,3 +33,12 @@ ci-node-generate: pull-assets pull-assets: @git clean -xfd assets @curl --fail -slL -o- https://github.com/owncloud/graph-explorer/releases/download/v1.7.10.3/release.tar.gz | tar xvzf - -C assets/ + +############ licenses ############ +.PHONY: ci-node-check-licenses +ci-node-check-licenses: + #TODO: check this fork! + +.PHONY: ci-node-save-licenses +ci-node-save-licenses: + #TODO: check this fork! diff --git a/graph/Makefile b/graph/Makefile index 9494229c8..e94f74f4b 100644 --- a/graph/Makefile +++ b/graph/Makefile @@ -32,8 +32,8 @@ ci-go-generate: $(MOCKERY) # CI runs ci-node-generate automatically before this ci-node-generate: ############ licenses ############ -.PHONY: ci-node-licenses-check -ci-node-licenses-check: +.PHONY: ci-node-check-licenses +ci-node-check-licenses: -.PHONY: ci-node-licenses-save -ci-node-licenses-save: +.PHONY: ci-node-save-licenses +ci-node-save-licenses: diff --git a/idm/Makefile b/idm/Makefile index 7537bb3e9..4da8f773e 100644 --- a/idm/Makefile +++ b/idm/Makefile @@ -32,8 +32,8 @@ ci-go-generate: # CI runs ci-node-generate automatically before this target ci-node-generate: ############ licenses ############ -.PHONY: ci-node-licenses-check -ci-node-licenses-check: +.PHONY: ci-node-check-licenses +ci-node-check-licenses: -.PHONY: ci-node-licenses-save -ci-node-licenses-save: +.PHONY: ci-node-save-licenses +ci-node-save-licenses: diff --git a/idp/Makefile b/idp/Makefile index e7304b3bd..c0c891992 100644 --- a/idp/Makefile +++ b/idp/Makefile @@ -58,14 +58,14 @@ yarn-build: node_modules .PHONY: node_modules node_modules: - yarn install --immutable + @yarn install --immutable 2>&1 >/dev/null ############ licenses ############ -.PHONY: ci-node-licenses-check -ci-node-licenses-check: +.PHONY: ci-node-check-licenses +ci-node-check-licenses: node_modules yarn licenses:check -.PHONY: ci-node-licenses-save -ci-node-licenses-save: +.PHONY: ci-node-save-licenses +ci-node-save-licenses: node_modules yarn licenses:csv yarn licenses:save diff --git a/ocis-pkg/Makefile b/ocis-pkg/Makefile index 47dd3fb1e..af35a8664 100644 --- a/ocis-pkg/Makefile +++ b/ocis-pkg/Makefile @@ -32,8 +32,8 @@ ci-go-generate: # CI runs ci-node-generate automatically before this target ci-node-generate: ############ licenses ############ -.PHONY: ci-node-licenses-check -ci-node-licenses-check: +.PHONY: ci-node-check-licenses +ci-node-check-licenses: -.PHONY: ci-node-licenses-save -ci-node-licenses-save: +.PHONY: ci-node-save-licenses +ci-node-save-licenses: diff --git a/ocis/Makefile b/ocis/Makefile index 778f78a55..2a3546324 100644 --- a/ocis/Makefile +++ b/ocis/Makefile @@ -44,8 +44,8 @@ ci-node-generate: # ocis needs assets of all other modules ; fi; ############ licenses ############ -.PHONY: ci-node-licenses-check -ci-node-licenses-check: +.PHONY: ci-node-check-licenses +ci-node-check-licenses: -.PHONY: ci-node-licenses-save -ci-node-licenses-save: +.PHONY: ci-node-save-licenses +ci-node-save-licenses: diff --git a/ocs/Makefile b/ocs/Makefile index 3cd39482c..ba3cb5065 100644 --- a/ocs/Makefile +++ b/ocs/Makefile @@ -30,8 +30,8 @@ ci-go-generate: # CI runs ci-node-generate automatically before this target ci-node-generate: ############ licenses ############ -.PHONY: ci-node-licenses-check -ci-node-licenses-check: +.PHONY: ci-node-check-licenses +ci-node-check-licenses: -.PHONY: ci-node-licenses-save -ci-node-licenses-save: +.PHONY: ci-node-save-licenses +ci-node-save-licenses: diff --git a/proxy/Makefile b/proxy/Makefile index 65f0556e8..e700f7335 100644 --- a/proxy/Makefile +++ b/proxy/Makefile @@ -30,8 +30,8 @@ ci-go-generate: # CI runs ci-node-generate automatically before this target ci-node-generate: ############ licenses ############ -.PHONY: ci-node-licenses-check -ci-node-licenses-check: +.PHONY: ci-node-check-licenses +ci-node-check-licenses: -.PHONY: ci-node-licenses-save -ci-node-licenses-save: +.PHONY: ci-node-save-licenses +ci-node-save-licenses: diff --git a/settings/Makefile b/settings/Makefile index b5d52260e..43a56277c 100644 --- a/settings/Makefile +++ b/settings/Makefile @@ -47,7 +47,7 @@ yarn-build: node_modules .PHONY: node_modules node_modules: - yarn install --immutable + @yarn install --immutable 2>&1 >/dev/null ############ protobuf ############ include ../.make/protobuf.mk @@ -56,11 +56,11 @@ include ../.make/protobuf.mk protobuf: buf-generate ############ licenses ############ -.PHONY: ci-node-licenses-check -ci-node-licenses-check: +.PHONY: ci-node-check-licenses +ci-node-check-licenses: node_modules yarn licenses:check -.PHONY: ci-node-licenses-save -ci-node-licenses-save: +.PHONY: ci-node-save-licenses +ci-node-save-licenses: node_modules yarn licenses:csv yarn licenses:save diff --git a/storage/Makefile b/storage/Makefile index de1134e85..ac9af7fe1 100644 --- a/storage/Makefile +++ b/storage/Makefile @@ -30,8 +30,8 @@ ci-go-generate: # CI runs ci-node-generate automatically before this target ci-node-generate: ############ licenses ############ -.PHONY: ci-node-licenses-check -ci-node-licenses-check: +.PHONY: ci-node-check-licenses +ci-node-check-licenses: -.PHONY: ci-node-licenses-save -ci-node-licenses-save: +.PHONY: ci-node-save-licenses +ci-node-save-licenses: diff --git a/store/Makefile b/store/Makefile index 50f1511c7..3e913805b 100644 --- a/store/Makefile +++ b/store/Makefile @@ -38,8 +38,8 @@ include ../.make/protobuf.mk protobuf: buf-generate ############ licenses ############ -.PHONY: ci-node-licenses-check -ci-node-licenses-check: +.PHONY: ci-node-check-licenses +ci-node-check-licenses: -.PHONY: ci-node-licenses-save -ci-node-licenses-save: +.PHONY: ci-node-save-licenses +ci-node-save-licenses: diff --git a/thumbnails/Makefile b/thumbnails/Makefile index 28402424a..d5444df91 100644 --- a/thumbnails/Makefile +++ b/thumbnails/Makefile @@ -37,8 +37,8 @@ include ../.make/protobuf.mk protobuf: buf-generate ############ licenses ############ -.PHONY: ci-node-licenses-check -ci-node-licenses-check: +.PHONY: ci-node-check-licenses +ci-node-check-licenses: -.PHONY: ci-node-licenses-save -ci-node-licenses-save: +.PHONY: ci-node-save-licenses +ci-node-save-licenses: diff --git a/web/Makefile b/web/Makefile index 57b5f9980..5e82de49c 100644 --- a/web/Makefile +++ b/web/Makefile @@ -36,8 +36,8 @@ pull-assets: @curl --fail -slL -o- https://github.com/owncloud/web/releases/download/$(WEB_ASSETS_VERSION)/web.tar.gz | tar xzf - -C assets/ ############ licenses ############ -.PHONY: ci-node-licenses-check -ci-node-licenses-check: +.PHONY: ci-node-check-licenses +ci-node-check-licenses: -.PHONY: ci-node-licenses-save -ci-node-licenses-save: +.PHONY: ci-node-save-licenses +ci-node-save-licenses: diff --git a/webdav/Makefile b/webdav/Makefile index 84e079900..87ceace39 100644 --- a/webdav/Makefile +++ b/webdav/Makefile @@ -30,8 +30,8 @@ ci-go-generate: # CI runs ci-node-generate automatically before this target ci-node-generate: ############ licenses ############ -.PHONY: ci-node-licenses-check -ci-node-licenses-check: +.PHONY: ci-node-check-licenses +ci-node-check-licenses: -.PHONY: ci-node-licenses-save -ci-node-licenses-save: +.PHONY: ci-node-save-licenses +ci-node-save-licenses: