mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-12-23 00:46:30 +00:00
Code Issues Projects Releases Wiki Activity

Move skip-ci back in front of config fetching (#2555)

Browse source
This commit is contained in:
Anbraten 2023-10-09 18:15:53 +02:00 committed by GitHub
parent 46273e54d8
commit 62d6a6bc34
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pipeline/frontend/yaml/constraint/constraint.go
View file

@ -19,20 +19,16 @@ import (
"fmt" "fmt"
"maps" "maps"
"path" "path"
"regexp"
"strings" "strings"
"github.com/antonmedv/expr" "github.com/antonmedv/expr"
"github.com/bmatcuk/doublestar/v4" "github.com/bmatcuk/doublestar/v4"
"github.com/rs/zerolog/log"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
"github.com/woodpecker-ci/woodpecker/pipeline/frontend/metadata" "github.com/woodpecker-ci/woodpecker/pipeline/frontend/metadata"
yamlBaseTypes "github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml/types/base" yamlBaseTypes "github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml/types/base"
) )
var skipRe = regexp.MustCompile(`\[(?i:ci *skip|skip *ci)\]`)
type ( type (
// When defines a set of runtime constraints. // When defines a set of runtime constraints.
When struct { When struct {
@ -82,16 +78,6 @@ func (when *When) IsEmpty() bool {
// Returns true if at least one of the internal constraints is true. // Returns true if at least one of the internal constraints is true.
func (when *When) Match(metadata metadata.Metadata, global bool, env map[string]string) (bool, error) { func (when *When) Match(metadata metadata.Metadata, global bool, env map[string]string) (bool, error) {
if global {
// skip the whole workflow if any case-insensitive combination of the words "skip" and "ci"
// wrapped in square brackets appear in the commit message
skipMatch := skipRe.FindString(metadata.Curr.Commit.Message)
if len(skipMatch) > 0 {
log.Debug().Msgf("skip workflow as keyword to do so was detected in commit message '%s'", metadata.Curr.Commit.Message)
return false, nil
}
}
for _, c := range when.Constraints { for _, c := range when.Constraints {
match, err := c.Match(metadata, global, env) match, err := c.Match(metadata, global, env)
if err != nil { if err != nil {

9
server/pipeline/create.go
View file

@ -17,6 +17,7 @@ package pipeline
import ( import (
"context" "context"
"fmt" "fmt"
"regexp"
"time" "time"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
@ -27,6 +28,8 @@ import (
"github.com/woodpecker-ci/woodpecker/server/store" "github.com/woodpecker-ci/woodpecker/server/store"
) )
var skipPipelineRegex = regexp.MustCompile(`\[(?i:ci *skip|skip *ci)\]`)
// Create a new pipeline and start it // Create a new pipeline and start it
func Create(ctx context.Context, _store store.Store, repo *model.Repo, pipeline *model.Pipeline) (*model.Pipeline, error) { func Create(ctx context.Context, _store store.Store, repo *model.Repo, pipeline *model.Pipeline) (*model.Pipeline, error) {
repoUser, err := _store.GetUser(repo.UserID) repoUser, err := _store.GetUser(repo.UserID)
@ -36,6 +39,12 @@ func Create(ctx context.Context, _store store.Store, repo *model.Repo, pipeline
return nil, fmt.Errorf(msg) return nil, fmt.Errorf(msg)
} }
skipMatch := skipPipelineRegex.FindString(pipeline.Message)
if len(skipMatch) > 0 {
log.Debug().Str("repo", repo.FullName).Msgf("ignoring pipeline as skip-ci was found in the commit (%s) message '%s'", pipeline.Commit, pipeline.Message)
return nil, ErrFiltered
}
// If the forge has a refresh token, the current access token // If the forge has a refresh token, the current access token
// may be stale. Therefore, we should refresh prior to dispatching // may be stale. Therefore, we should refresh prior to dispatching
// the pipeline. // the pipeline.