parent
1ed584ed1c
commit
11e803d6f0
|
@ -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
|
||||
|
|
|
@ -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 {
|
||||
|
|
Loading…
Reference in New Issue