mirror of
https://github.com/woodpecker-ci/woodpecker.git
synced 2025-01-03 06:08:42 +00:00
Fix spellcheck and enable more dirs (#3603)
This commit is contained in:
parent
8e45ddd58b
commit
c9a3bfb321
10 changed files with 26 additions and 17 deletions
15
.cspell.json
15
.cspell.json
|
@ -79,7 +79,18 @@
|
||||||
"HEALTHCHECK",
|
"HEALTHCHECK",
|
||||||
"devx",
|
"devx",
|
||||||
"gomod",
|
"gomod",
|
||||||
"laszlocph"
|
"laszlocph",
|
||||||
|
"charmbracelet",
|
||||||
|
"GODEBUG",
|
||||||
|
"netdns",
|
||||||
|
"BUILDPLATFORM",
|
||||||
|
"repology",
|
||||||
|
"WORKDIR",
|
||||||
|
"corepack",
|
||||||
|
"binutils",
|
||||||
|
"nocolor",
|
||||||
|
"logfile",
|
||||||
|
"Keyfunc"
|
||||||
],
|
],
|
||||||
"ignorePaths": [
|
"ignorePaths": [
|
||||||
"**/node_modules/**/*",
|
"**/node_modules/**/*",
|
||||||
|
@ -103,10 +114,8 @@
|
||||||
"agent/",
|
"agent/",
|
||||||
"cli/",
|
"cli/",
|
||||||
"cmd/",
|
"cmd/",
|
||||||
"docker/",
|
|
||||||
"docs/",
|
"docs/",
|
||||||
"pipeline/",
|
"pipeline/",
|
||||||
"shared/",
|
|
||||||
"server/"
|
"server/"
|
||||||
],
|
],
|
||||||
"enableFiletypes": ["dockercompose"]
|
"enableFiletypes": ["dockercompose"]
|
||||||
|
|
|
@ -213,7 +213,7 @@ func (e *docker) StartStep(ctx context.Context, step *backend.Step, taskUUID str
|
||||||
}
|
}
|
||||||
|
|
||||||
// add default volumes to the host configuration
|
// add default volumes to the host configuration
|
||||||
hostConfig.Binds = utils.DedupStrings(append(hostConfig.Binds, e.volumes...))
|
hostConfig.Binds = utils.DeduplicateStrings(append(hostConfig.Binds, e.volumes...))
|
||||||
|
|
||||||
_, err := e.client.ContainerCreate(ctx, config, hostConfig, nil, nil, containerName)
|
_, err := e.client.ContainerCreate(ctx, config, hostConfig, nil, nil, containerName)
|
||||||
if client.IsErrNotFound(err) {
|
if client.IsErrNotFound(err) {
|
||||||
|
|
|
@ -118,7 +118,7 @@ func getChangedFilesFromPushHook(hook *pushHook) []string {
|
||||||
files = append(files, hook.HeadCommit.Removed...)
|
files = append(files, hook.HeadCommit.Removed...)
|
||||||
files = append(files, hook.HeadCommit.Modified...)
|
files = append(files, hook.HeadCommit.Modified...)
|
||||||
|
|
||||||
return utils.DedupStrings(files)
|
return utils.DeduplicateStrings(files)
|
||||||
}
|
}
|
||||||
|
|
||||||
// helper function that extracts the Pipeline data from a Gitea tag hook
|
// helper function that extracts the Pipeline data from a Gitea tag hook
|
||||||
|
|
|
@ -630,7 +630,7 @@ func (c *client) loadChangedFilesFromPullRequest(ctx context.Context, pull *gith
|
||||||
|
|
||||||
opts.Page = resp.NextPage
|
opts.Page = resp.NextPage
|
||||||
}
|
}
|
||||||
return utils.DedupStrings(fileList), nil
|
return utils.DeduplicateStrings(fileList), nil
|
||||||
})
|
})
|
||||||
|
|
||||||
return pipeline, err
|
return pipeline, err
|
||||||
|
|
|
@ -215,5 +215,5 @@ func getChangedFilesFromCommits(commits []*github.HeadCommit) []string {
|
||||||
files = append(files, cm.Removed...)
|
files = append(files, cm.Removed...)
|
||||||
files = append(files, cm.Modified...)
|
files = append(files, cm.Modified...)
|
||||||
}
|
}
|
||||||
return utils.DedupStrings(files)
|
return utils.DeduplicateStrings(files)
|
||||||
}
|
}
|
||||||
|
|
|
@ -189,7 +189,7 @@ func convertPushHook(hook *gitlab.PushEvent) (*model.Repo, *model.Pipeline, erro
|
||||||
files = append(files, cm.Removed...)
|
files = append(files, cm.Removed...)
|
||||||
files = append(files, cm.Modified...)
|
files = append(files, cm.Modified...)
|
||||||
}
|
}
|
||||||
pipeline.ChangedFiles = utils.DedupStrings(files)
|
pipeline.ChangedFiles = utils.DeduplicateStrings(files)
|
||||||
|
|
||||||
return repo, pipeline, nil
|
return repo, pipeline, nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -808,7 +808,7 @@ func (g *GitLab) loadChangedFilesFromMergeRequest(ctx context.Context, tmpRepo *
|
||||||
for _, file := range changes {
|
for _, file := range changes {
|
||||||
files = append(files, file.NewPath, file.OldPath)
|
files = append(files, file.NewPath, file.OldPath)
|
||||||
}
|
}
|
||||||
pipeline.ChangedFiles = utils.DedupStrings(files)
|
pipeline.ChangedFiles = utils.DeduplicateStrings(files)
|
||||||
|
|
||||||
return pipeline, nil
|
return pipeline, nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -139,19 +139,19 @@ func keyFunc(token *Token, fn SecretFunc) jwt.Keyfunc {
|
||||||
|
|
||||||
// extract the token kind and cast to
|
// extract the token kind and cast to
|
||||||
// the expected type.
|
// the expected type.
|
||||||
kindv, ok := claims["type"]
|
kind, ok := claims["type"]
|
||||||
if !ok {
|
if !ok {
|
||||||
return nil, jwt.ErrInvalidType
|
return nil, jwt.ErrInvalidType
|
||||||
}
|
}
|
||||||
token.Kind, _ = kindv.(string)
|
token.Kind, _ = kind.(string)
|
||||||
|
|
||||||
// extract the token value and cast to
|
// extract the token value and cast to
|
||||||
// expected type.
|
// expected type.
|
||||||
textv, ok := claims["text"]
|
text, ok := claims["text"]
|
||||||
if !ok {
|
if !ok {
|
||||||
return nil, jwt.ErrInvalidType
|
return nil, jwt.ErrInvalidType
|
||||||
}
|
}
|
||||||
token.Text, _ = textv.(string)
|
token.Text, _ = text.(string)
|
||||||
|
|
||||||
// invoke the callback function to retrieve
|
// invoke the callback function to retrieve
|
||||||
// the secret key used to verify
|
// the secret key used to verify
|
||||||
|
|
|
@ -14,8 +14,8 @@
|
||||||
|
|
||||||
package utils
|
package utils
|
||||||
|
|
||||||
// DedupStrings deduplicate string list, empty items are dropped
|
// DeduplicateStrings deduplicate string list, empty items are dropped
|
||||||
func DedupStrings(src []string) []string {
|
func DeduplicateStrings(src []string) []string {
|
||||||
m := make(map[string]struct{}, len(src))
|
m := make(map[string]struct{}, len(src))
|
||||||
dst := make([]string, 0, len(src))
|
dst := make([]string, 0, len(src))
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,7 @@ import (
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestDedupStrings(t *testing.T) {
|
func TestDeduplicateStrings(t *testing.T) {
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
in []string
|
in []string
|
||||||
out []string
|
out []string
|
||||||
|
@ -37,7 +37,7 @@ func TestDedupStrings(t *testing.T) {
|
||||||
}}
|
}}
|
||||||
|
|
||||||
for _, tc := range tests {
|
for _, tc := range tests {
|
||||||
result := DedupStrings(tc.in)
|
result := DeduplicateStrings(tc.in)
|
||||||
sort.Strings(result)
|
sort.Strings(result)
|
||||||
if len(tc.out) == 0 {
|
if len(tc.out) == 0 {
|
||||||
assert.Len(t, result, 0)
|
assert.Len(t, result, 0)
|
||||||
|
|
Loading…
Reference in a new issue