From e6daab182cae34f65abaff07723cb903bb9f4ae6 Mon Sep 17 00:00:00 2001 From: Felipe Martin Date: Mon, 4 Aug 2025 16:38:34 +0200 Subject: [PATCH 1/5] fix: remove unexisting golangci-lint checker from migration to v2 --- assets/.golangci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/assets/.golangci.yml b/assets/.golangci.yml index 69f30a5..b2710f1 100644 --- a/assets/.golangci.yml +++ b/assets/.golangci.yml @@ -11,7 +11,6 @@ linters: - nakedret - revive - staticcheck # Now includes gosimple and stylecheck - - typecheck - unconvert - unused - whitespace @@ -69,7 +68,7 @@ formatters: goimports: local-prefixes: - - {{.GoModule.Name}} + - { { .GoModule.Name } } output: formats: From 4c555fe7f0245d25f8c09efa0c56fc4cdb188b7a Mon Sep 17 00:00:00 2001 From: Felipe Martin Date: Mon, 4 Aug 2025 16:38:34 +0200 Subject: [PATCH 2/5] fix: remove unexisting golangci-lint checker from migration to v2 --- assets/.golangci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/assets/.golangci.yml b/assets/.golangci.yml index 69f30a5..83fd28a 100644 --- a/assets/.golangci.yml +++ b/assets/.golangci.yml @@ -11,7 +11,6 @@ linters: - nakedret - revive - staticcheck # Now includes gosimple and stylecheck - - typecheck - unconvert - unused - whitespace From 86844eb7133944dc0efe79c8472f7857df2e1f2c Mon Sep 17 00:00:00 2001 From: Felipe Martin Date: Wed, 6 Aug 2025 18:52:41 +0200 Subject: [PATCH 3/5] chore: ignore output in git command setup.mk --- assets/build/_setup.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/build/_setup.mk b/assets/build/_setup.mk index 91bcc00..9ff3a24 100644 --- a/assets/build/_setup.mk +++ b/assets/build/_setup.mk @@ -5,9 +5,9 @@ ifeq ($(GO),) endif # Gather build variables to inject into the manifest tool -BUILD_HASH_SHORT = $(shell git rev-parse --short HEAD) +BUILD_HASH_SHORT = $(shell git rev-parse --short HEAD 2>/dev/null) BUILD_TAG_LATEST = $(shell git describe --tags --match 'v*' --abbrev=0 2>/dev/null) -BUILD_TAG_CURRENT = $(shell git tag --points-at HEAD) +BUILD_TAG_CURRENT = $(shell git tag --points-at HEAD 2>/dev/null) # Extract the plugin id from the manifest. PLUGIN_ID ?= $(shell pluginctl manifest get '{{"{{"}}.Id{{"}}"}}') From b820acf8097ad5abb107e4991bf2bfd265dcff95 Mon Sep 17 00:00:00 2001 From: Felipe Martin Date: Wed, 6 Aug 2025 18:52:53 +0200 Subject: [PATCH 4/5] fix: add HasWebapp and HasServer to manifest parsing --- manifest.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/manifest.go b/manifest.go index d13a047..945c94d 100644 --- a/manifest.go +++ b/manifest.go @@ -188,7 +188,15 @@ Examples: } var buf bytes.Buffer - if err := tmpl.Execute(&buf, *manifest); err != nil { + if err := tmpl.Execute(&buf, struct { + model.Manifest + HasWebapp bool + HasServer bool + }{ + Manifest: *manifest, + HasWebapp: HasWebappCode(manifest), + HasServer: HasServerCode(manifest), + }); err != nil { return fmt.Errorf("failed to execute template: %w", err) } From 843fd9d38a983981f5ddeabda1cd194fe6e99c33 Mon Sep 17 00:00:00 2001 From: Felipe Martin Date: Wed, 6 Aug 2025 18:53:55 +0200 Subject: [PATCH 5/5] fix: do not manually include setup.mk --- assets/Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/assets/Makefile b/assets/Makefile index c3a899c..ac014a2 100644 --- a/assets/Makefile +++ b/assets/Makefile @@ -23,9 +23,6 @@ ASSETS_DIR ?= assets .PHONY: default default: all -# Verify environment, and define PLUGIN_ID, PLUGIN_VERSION, HAS_SERVER and HAS_WEBAPP as needed. -include build/setup.mk - ifneq ($(MM_DEBUG),) GO_BUILD_GCFLAGS = -gcflags "all=-N -l" else