diff --git a/.woodpecker/notify.yml b/.woodpecker/notify.yml index 2183aae..a851904 100644 --- a/.woodpecker/notify.yml +++ b/.woodpecker/notify.yml @@ -19,7 +19,6 @@ steps: from_secret: matrix_roomid username: from_secret: matrix_username - template: "{{ .Pipeline }} ++ {{ .Repository }} ++ {{ .Curr }}" when: - status: [success, failure] diff --git a/_docs/data/data.yaml b/_docs/data/data.yaml index 42c5bc1..93b3cb0 100644 --- a/_docs/data/data.yaml +++ b/_docs/data/data.yaml @@ -37,7 +37,7 @@ properties: is exposed to the template and all fields can be referenced. To extend the functionality, [sprig functions](https://masterminds.github.io/sprig/) can also be used. defaultValue: | Status: **{{ .Pipeline.Status }}**
- Build: [{{ .Repository.Owner }}/{{ .Repository.Name }}]({{ .Pipeline.Link }}){{ if .Curr.TargetBranch }} ({{ .Curr.TargetBranch }}){{ end }} by {{ .Curr.Author }}
- Message: {{ .Curr.Message }} + Build: [{{ .Repository.Slug }}]({{ .Pipeline.URL }}){{ if .Curr.Branch }} ({{ .Curr.Branch }}){{ end }} by {{ .Curr.Author }}
+ Message: {{ .Curr.Message }}{{ if .Curr.URL }} ([source]({{ .Curr.URL }})){{ end }} type: string required: false diff --git a/cmd/wp-matrix/config.go b/cmd/wp-matrix/config.go index d9ecadd..7c93e79 100644 --- a/cmd/wp-matrix/config.go +++ b/cmd/wp-matrix/config.go @@ -14,8 +14,8 @@ import ( //nolint:lll const defaultTemplate = ` Status: **{{ .Pipeline.Status }}**
-Build: [{{ .Repository.Owner }}/{{ .Repository.Name }}]({{ .Pipeline.Link }}){{ if .Curr.TargetBranch }} ({{ .Curr.TargetBranch }}){{ end }} by {{ .Curr.Author }}
-Message: {{ .Curr.Message }} +Build: [{{ .Repository.Slug }}]({{ .Pipeline.URL }}){{ if .Curr.Branch }} ({{ .Curr.Branch }}){{ end }} by {{ .Curr.Author }}
+Message: {{ .Curr.Message }}{{ if .Curr.URL }} ([source]({{ .Curr.URL }})){{ end }} ` // settingsFlags has the cli.Flags for the plugin.Settings. diff --git a/go.mod b/go.mod index 71bab46..be6def7 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/microcosm-cc/bluemonday v1.0.25 github.com/rs/zerolog v1.30.0 github.com/russross/blackfriday/v2 v2.1.0 - github.com/thegeeklab/wp-plugin-go v0.2.2-0.20230816063606-7c3ed98b566a + github.com/thegeeklab/wp-plugin-go v0.2.2-0.20230816083104-032314d414ea github.com/urfave/cli/v2 v2.25.7 maunium.net/go/mautrix v0.15.4 ) diff --git a/go.sum b/go.sum index 59d8399..aa5e74f 100644 --- a/go.sum +++ b/go.sum @@ -61,6 +61,8 @@ github.com/thegeeklab/wp-plugin-go v0.2.0 h1:uQzyCNUS2CthdtL5OssprhFKxJoGVyuEXMU github.com/thegeeklab/wp-plugin-go v0.2.0/go.mod h1:7PWAZiTnZ2fAvjsedopQJ6w873KuSxUWsAml1Yib8a0= github.com/thegeeklab/wp-plugin-go v0.2.2-0.20230816063606-7c3ed98b566a h1:2SXI3FX9Sf/1LOUKezkBzTYLSzduNTjCspvC8ILqwe4= github.com/thegeeklab/wp-plugin-go v0.2.2-0.20230816063606-7c3ed98b566a/go.mod h1:7PWAZiTnZ2fAvjsedopQJ6w873KuSxUWsAml1Yib8a0= +github.com/thegeeklab/wp-plugin-go v0.2.2-0.20230816083104-032314d414ea h1:T9AOBWIVFO7+jizbgXA1lwYjfM+IKZ6VgApq0PD922M= +github.com/thegeeklab/wp-plugin-go v0.2.2-0.20230816083104-032314d414ea/go.mod h1:7PWAZiTnZ2fAvjsedopQJ6w873KuSxUWsAml1Yib8a0= github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/gjson v1.14.4 h1:uo0p8EbA09J7RQaflQ1aBRffTR7xedD2bcIVSYxLnkM= github.com/tidwall/gjson v1.14.4/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=