@@ -170,31 +170,43 @@ func (g *googlechatNotifier) writeMessage(build *cbpb.Build) (*chat.Message, err
170
170
171
171
repo_name := build .Substitutions ["REPO_NAME" ]
172
172
trigger_name := build .Substitutions ["TRIGGER_NAME" ]
173
- branch_name := build .Substitutions ["BRANCH_NAME" ]
174
173
commit := build .Substitutions ["SHORT_SHA" ]
175
174
175
+ // Branch, Tag, or None.
176
+ branch_tag_label := "Branch"
177
+ branch_tag_value := build .Substitutions ["BRANCH_NAME" ]
178
+
179
+ if branch_tag_value == "" {
180
+ branch_tag_label = "Tag"
181
+ branch_tag_value = build .Substitutions ["TAG_NAME" ]
182
+
183
+ if branch_tag_value == "" {
184
+ branch_tag_label = "Branch/Tag"
185
+ branch_tag_value = "[no branch or tag]"
186
+ }
187
+ }
188
+
176
189
card .Header .Subtitle = fmt .Sprintf ("%s on %s" , trigger_name , build .ProjectId )
177
190
178
191
build_info := & chat.Section {
179
192
Header : "Trigger information" ,
180
193
Widgets : []* chat.WidgetMarkup {
181
194
{
182
-
183
195
KeyValue : & chat.KeyValue {
184
196
TopLabel : "Trigger" ,
185
197
Content : trigger_name ,
186
198
},
187
199
},
188
200
{
189
201
KeyValue : & chat.KeyValue {
190
- TopLabel : ` Repo` ,
202
+ TopLabel : " Repo" ,
191
203
Content : repo_name ,
192
204
},
193
205
},
194
206
{
195
207
KeyValue : & chat.KeyValue {
196
- TopLabel : "Branch" ,
197
- Content : branch_name ,
208
+ TopLabel : branch_tag_label ,
209
+ Content : branch_tag_value ,
198
210
},
199
211
},
200
212
{
0 commit comments