a
/
agola
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #147 from sgotti/fix_when_reftype_tag 

when: fix typo in tag matching
This commit is contained in:
Simone Gotti 2019-10-23 10:25:49 +02:00 committed by GitHub
parent 1ed584ed1c 11e803d6f0
commit 400de5f720
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/types/when.go
View File

@ -58,7 +58,7 @@ func MatchWhen(when *When, refType itypes.RunRefType, branch, tag, ref string) b
}
}
// test only if tag is not empty, if empty mean that we are not in a tag
if refType == itypes.RunRefTypeBranch && when.Tag != nil && tag != "" {
if refType == itypes.RunRefTypeTag && when.Tag != nil && tag != "" {
// first check includes and override with excludes
if matchCondition(when.Tag.Include, tag) {
include = true

17
services/types/when_test.go
View File

@ -284,7 +284,7 @@ func TestMatchWhen(t *testing.T) {
out: false,
},
{
name: "test only matching reftype",
name: "test only matching branch reftype",
when: &When{
Branch: &WhenConditions{
Include: []WhenCondition{
@ -298,6 +298,21 @@ func TestMatchWhen(t *testing.T) {
tag: "master",
out: false,
},
{
name: "test only matching tag reftype",
when: &When{
Tag: &WhenConditions{
Include: []WhenCondition{
{Type: WhenConditionTypeSimple, Match: "master"},
},
},
},
refType: itypes.RunRefTypeBranch,
branch: "master",
// we provide also a value to tag (should not be done)
tag: "master",
out: false,
},
}
for _, tt := range tests {