test: extract go bin

2025-12-23 22:29:59 -05:00 · 2025-03-12 11:32:21 +01:00
parent a000dd9612
commit 22fb783724
25 changed files with 43 additions and 71 deletions
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -5,7 +5,6 @@ linters:
  disable:
    - contextcheck # FIXME: causes panic in graph service
    - lll # 760 issues in the codebase
-    - exhaustivestruct
    - exhaustruct
    - exhaustive # 634 issues in the codebase
    - wrapcheck # 398 issues in the codebase
@@ -16,14 +15,12 @@ linters:
    - forbidigo
    - gochecknoglobals
    - nlreturn
-    - nosnakecase  # each 100-200 issues in codebase
    - gci
    - godot
    - funlen
-    - gomnd
    - gofumpt
    - ireturn
-    - goerr113
+    - err113
    - containedctx
    - paralleltest
    - gocritic # each 50-100 issues in codebase
@@ -31,8 +28,6 @@ linters:
    - cyclop
    - noctx
    - testpackage
-    - maligned
-    - golint
    - forcetypeassert
    - nonamedreturns
    - dupl
--- a/.make/go.mk
+++ b/.make/go.mk
@@ -67,18 +67,6 @@ fmt:
 	@echo "- $(NAME): fmt"
 	gofmt -s -w $(SOURCES)

-.PHONY: golangci-lint-fix
-golangci-lint-fix: $(GOLANGCI_LINT)
-	$(GOLANGCI_LINT) run $(LINTERS) --fix
-
-.PHONY: golangci-lint
-golangci-lint: $(GOLANGCI_LINT)
-	$(GOLANGCI_LINT) run --path-prefix services/$(NAME)
-
-.PHONY: ci-golangci-lint
-ci-golangci-lint: $(GOLANGCI_LINT)
-	$(GOLANGCI_LINT) run --path-prefix services/$(NAME) --timeout 15m0s --issues-exit-code 0 --out-format checkstyle > checkstyle.xml
-
 .PHONY: test
 test:
 	@go test -v -tags '$(TAGS)' -coverprofile coverage.out ./...
--- a/.woodpecker.star
+++ b/.woodpecker.star
@@ -418,8 +418,14 @@ def main(ctx):

    build_release_helpers = \
        changelog() + \
-        docs() + \
-        licenseCheck(ctx)
+        docs()
+
+    build_release_helpers.append(
+        pipelineDependsOn(
+            licenseCheck(ctx),
+            getGoBinForTesting(ctx),
+        ),
+    )

    test_pipelines = \
        codestyle(ctx) + \
@@ -1741,20 +1747,9 @@ def binaryRelease(ctx, arch, build_type, target, depends_on = []):
    }

 def licenseCheck(ctx):
-    # uploads third-party-licenses to https://download.owncloud.com/ocis/ocis/daily/
-    target = "/ocis/%s/daily" % (ctx.repo.name.replace("ocis-", ""))
-    if ctx.build.event == "tag":
-        # uploads third-party-licenses to eg. https://download.owncloud.com/ocis/ocis/1.0.0-beta9/
-        folder = "stable"
-        buildref = ctx.build.ref.replace("refs/tags/v", "")
-        buildref = buildref.lower()
-        if buildref.find("-") != -1:  # "x.x.x-alpha", "x.x.x-beta", "x.x.x-rc"
-            folder = "testing"
-        target = "/ocis/%s/%s/%s" % (ctx.repo.name.replace("ocis-", ""), folder, buildref)
-
-    return [{
+    return {
        "name": "check-licenses",
-        "steps": [
+        "steps": restoreGoBinCache() + [
            {
                "name": "node-check-licenses",
                "image": OC_CI_NODEJS % DEFAULT_NODEJS_VERSION,
@@ -1840,7 +1835,7 @@ def licenseCheck(ctx):
            },
        ],
        "workspace": workspace,
-    }]
+    }

 def releaseDockerManifest(ctx, repo, build_type):
    spec = "manifest.tmpl"
@@ -2503,10 +2498,8 @@ def genericCachePurge(flush_path):
            {
                "event": "pull_request",
            },
-            # {
-            #     "status": ["success", "failure"]
-            # },
        ],
+        "runs_on": ["failure"],
    }

 def genericBuildArtifactCache(ctx, name, action, path):
--- a/22
+++ b/22
@@ -213,20 +213,16 @@ protobuf:
    done

 .PHONY: golangci-lint
-golangci-lint:
-	@for mod in $(OC_MODULES); do \
-        $(MAKE) --no-print-directory -C $$mod golangci-lint; \
-    done
+golangci-lint: $(GOLANGCI_LINT)
+	$(GOLANGCI_LINT) run --modules-download-mode vendor --timeout 15m0s --issues-exit-code 0 --out-format checkstyle > checkstyle.xml

 .PHONY: ci-golangci-lint
-ci-golangci-lint: $(GOLANGCI_LINT)
+ci-golangci-lint:
 	$(GOLANGCI_LINT) run --modules-download-mode vendor --timeout 15m0s --issues-exit-code 0 --out-format checkstyle > checkstyle.xml

 .PHONY: golangci-lint-fix
-golangci-lint-fix:
-	@for mod in $(OC_MODULES); do \
-        $(MAKE) --no-print-directory -C $$mod golangci-lint-fix; \
-    done
+golangci-lint-fix: $(GOLANGCI_LINT)
+	$(GOLANGCI_LINT) run --fix --modules-download-mode vendor --timeout 15m0s --issues-exit-code 0 --out-format checkstyle > checkstyle.xml

 .PHONY: test-gherkin-lint
 test-gherkin-lint:
@@ -241,13 +237,13 @@ bingo-update: $(BINGO)
 	$(BINGO) get -l -v -t 20

 .PHONY: check-licenses
-check-licenses: ci-go-check-licenses ci-node-check-licenses
+check-licenses: $(GO_LICENSES) ci-go-check-licenses ci-node-check-licenses

 .PHONY: save-licenses
-save-licenses: ci-go-save-licenses ci-node-save-licenses
+save-licenses: $(GO_LICENSES) ci-go-save-licenses ci-node-save-licenses

 .PHONY: ci-go-check-licenses
-ci-go-check-licenses: $(GO_LICENSES)
+ci-go-check-licenses:
 	$(GO_LICENSES) check ./...

 .PHONY: ci-node-check-licenses
@@ -257,7 +253,7 @@ ci-node-check-licenses:
    done

 .PHONY: ci-go-save-licenses
-ci-go-save-licenses: $(GO_LICENSES)
+ci-go-save-licenses:
 	@mkdir -p ./third-party-licenses/go/opencloud/third-party-licenses
 	$(GO_LICENSES) csv ./... > ./third-party-licenses/go/opencloud/third-party-licenses.csv
 	$(GO_LICENSES) save ./... --force --save_path="./third-party-licenses/go/opencloud/third-party-licenses"
--- a/services/antivirus/pkg/scanners/mocks/scanner.go
+++ b/services/antivirus/pkg/scanners/mocks/scanner.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.0. DO NOT EDIT.
+// Code generated by mockery v2.53.2. DO NOT EDIT.

 package mocks

--- a/services/collaboration/mocks/connector_service.go
+++ b/services/collaboration/mocks/connector_service.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.0. DO NOT EDIT.
+// Code generated by mockery v2.53.2. DO NOT EDIT.

 package mocks

--- a/services/collaboration/mocks/content_connector_service.go
+++ b/services/collaboration/mocks/content_connector_service.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.0. DO NOT EDIT.
+// Code generated by mockery v2.53.2. DO NOT EDIT.

 package mocks

--- a/services/collaboration/mocks/file_connector_service.go
+++ b/services/collaboration/mocks/file_connector_service.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.0. DO NOT EDIT.
+// Code generated by mockery v2.53.2. DO NOT EDIT.

 package mocks

--- a/services/collaboration/mocks/gateway_selector.go
+++ b/services/collaboration/mocks/gateway_selector.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.0. DO NOT EDIT.
+// Code generated by mockery v2.53.2. DO NOT EDIT.

 package mocks

--- a/services/collaboration/mocks/lock_parser.go
+++ b/services/collaboration/mocks/lock_parser.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.0. DO NOT EDIT.
+// Code generated by mockery v2.53.2. DO NOT EDIT.

 package mocks

--- a/services/graph/Makefile
+++ b/services/graph/Makefile
@@ -14,7 +14,7 @@ include ../../.make/release.mk
 include ../../.make/docs.mk

 .PHONY: go-generate
-go-generate: $(MOCKERY)
+go-generate:
 	$(MOCKERY)

 .PHONY: l10n-pull
--- a/services/graph/mocks/base_graph_provider.go
+++ b/services/graph/mocks/base_graph_provider.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.0. DO NOT EDIT.
+// Code generated by mockery v2.53.2. DO NOT EDIT.

 package mocks

--- a/services/graph/mocks/drive_item_permissions_provider.go
+++ b/services/graph/mocks/drive_item_permissions_provider.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.0. DO NOT EDIT.
+// Code generated by mockery v2.53.2. DO NOT EDIT.

 package mocks

--- a/services/graph/mocks/drives_drive_item_provider.go
+++ b/services/graph/mocks/drives_drive_item_provider.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.0. DO NOT EDIT.
+// Code generated by mockery v2.53.2. DO NOT EDIT.

 package mocks

--- a/services/graph/mocks/gateway_selector.go
+++ b/services/graph/mocks/gateway_selector.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.0. DO NOT EDIT.
+// Code generated by mockery v2.53.2. DO NOT EDIT.

 package mocks

--- a/services/graph/mocks/http_client.go
+++ b/services/graph/mocks/http_client.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.0. DO NOT EDIT.
+// Code generated by mockery v2.53.2. DO NOT EDIT.

 package mocks

--- a/services/graph/mocks/permissions.go
+++ b/services/graph/mocks/permissions.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.0. DO NOT EDIT.
+// Code generated by mockery v2.53.2. DO NOT EDIT.

 package mocks

--- a/services/graph/mocks/publisher.go
+++ b/services/graph/mocks/publisher.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.0. DO NOT EDIT.
+// Code generated by mockery v2.53.2. DO NOT EDIT.

 package mocks

--- a/services/graph/mocks/role_service.go
+++ b/services/graph/mocks/role_service.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.0. DO NOT EDIT.
+// Code generated by mockery v2.53.2. DO NOT EDIT.

 package mocks

--- a/services/graph/pkg/identity/mocks/backend.go
+++ b/services/graph/pkg/identity/mocks/backend.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.0. DO NOT EDIT.
+// Code generated by mockery v2.53.2. DO NOT EDIT.

 package mocks

--- a/services/graph/pkg/identity/mocks/education_backend.go
+++ b/services/graph/pkg/identity/mocks/education_backend.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.0. DO NOT EDIT.
+// Code generated by mockery v2.53.2. DO NOT EDIT.

 package mocks

--- a/services/graph/pkg/identity/mocks/ldapclient.go
+++ b/services/graph/pkg/identity/mocks/ldapclient.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.0. DO NOT EDIT.
+// Code generated by mockery v2.53.2. DO NOT EDIT.

 package mocks

--- a/services/invitations/pkg/backends/keycloak/mocks/client.go
+++ b/services/invitations/pkg/backends/keycloak/mocks/client.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.0. DO NOT EDIT.
+// Code generated by mockery v2.53.2. DO NOT EDIT.

 package mocks

--- a/services/proxy/pkg/user/backend/mocks/user_backend.go
+++ b/services/proxy/pkg/user/backend/mocks/user_backend.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.0. DO NOT EDIT.
+// Code generated by mockery v2.53.2. DO NOT EDIT.

 package mocks

--- a/services/proxy/pkg/userroles/mocks/user_role_assigner.go
+++ b/services/proxy/pkg/userroles/mocks/user_role_assigner.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.0. DO NOT EDIT.
+// Code generated by mockery v2.53.2. DO NOT EDIT.

 package mocks