From 43ada66ddebaab5392da212279fd269b421d28a8 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Tue, 26 Mar 2024 11:02:00 +0100 Subject: [PATCH] allow glob expresion in pipeline config for labels --- server/grpc/filter.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/server/grpc/filter.go b/server/grpc/filter.go index 9cf2d87fa..6554352d7 100644 --- a/server/grpc/filter.go +++ b/server/grpc/filter.go @@ -15,6 +15,9 @@ package grpc import ( + "github.com/bmatcuk/doublestar/v4" + "github.com/rs/zerolog/log" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" "go.woodpecker-ci.org/woodpecker/v2/server/model" "go.woodpecker-ci.org/woodpecker/v2/server/queue" @@ -39,9 +42,11 @@ func createFilterFunc(agentFilter rpc.Filter) queue.FilterFn { continue } - if taskLabelValue != agentLabelValue { - return false + match, err := doublestar.Match(taskLabelValue, agentLabelValue) + if err != nil { + log.Error().Err(err).Msg("got unexpected error while try to match task and agent lable value") } + return match } return true }