Compare commits
1 commit
843fd9d38a
...
e6daab182c
Author | SHA1 | Date | |
---|---|---|---|
e6daab182c |
4 changed files with 7 additions and 12 deletions
|
@ -68,7 +68,7 @@ formatters:
|
||||||
|
|
||||||
goimports:
|
goimports:
|
||||||
local-prefixes:
|
local-prefixes:
|
||||||
- {{.GoModule.Name}}
|
- { { .GoModule.Name } }
|
||||||
|
|
||||||
output:
|
output:
|
||||||
formats:
|
formats:
|
||||||
|
|
|
@ -23,6 +23,9 @@ ASSETS_DIR ?= assets
|
||||||
.PHONY: default
|
.PHONY: default
|
||||||
default: all
|
default: all
|
||||||
|
|
||||||
|
# Verify environment, and define PLUGIN_ID, PLUGIN_VERSION, HAS_SERVER and HAS_WEBAPP as needed.
|
||||||
|
include build/setup.mk
|
||||||
|
|
||||||
ifneq ($(MM_DEBUG),)
|
ifneq ($(MM_DEBUG),)
|
||||||
GO_BUILD_GCFLAGS = -gcflags "all=-N -l"
|
GO_BUILD_GCFLAGS = -gcflags "all=-N -l"
|
||||||
else
|
else
|
||||||
|
|
|
@ -5,9 +5,9 @@ ifeq ($(GO),)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Gather build variables to inject into the manifest tool
|
# Gather build variables to inject into the manifest tool
|
||||||
BUILD_HASH_SHORT = $(shell git rev-parse --short HEAD 2>/dev/null)
|
BUILD_HASH_SHORT = $(shell git rev-parse --short HEAD)
|
||||||
BUILD_TAG_LATEST = $(shell git describe --tags --match 'v*' --abbrev=0 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 2>/dev/null)
|
BUILD_TAG_CURRENT = $(shell git tag --points-at HEAD)
|
||||||
|
|
||||||
# Extract the plugin id from the manifest.
|
# Extract the plugin id from the manifest.
|
||||||
PLUGIN_ID ?= $(shell pluginctl manifest get '{{"{{"}}.Id{{"}}"}}')
|
PLUGIN_ID ?= $(shell pluginctl manifest get '{{"{{"}}.Id{{"}}"}}')
|
||||||
|
|
10
manifest.go
10
manifest.go
|
@ -188,15 +188,7 @@ Examples:
|
||||||
}
|
}
|
||||||
|
|
||||||
var buf bytes.Buffer
|
var buf bytes.Buffer
|
||||||
if err := tmpl.Execute(&buf, struct {
|
if err := tmpl.Execute(&buf, *manifest); err != nil {
|
||||||
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)
|
return fmt.Errorf("failed to execute template: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Reference in a new issue