From 6828057f66b3ff8af599bb7dc8b329bbd2c5dfab Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sat, 16 Oct 2021 02:54:28 +0200 Subject: [PATCH] Switch default git plugin (#449) * update pipeline samples * update docs * use woodpeckerci/plugin-git:latest as default * code format nit --- docs/docs/20-usage/20-pipeline-syntax.md | 6 +++--- pipeline/frontend/yaml/compiler/compiler.go | 7 ++++--- pipeline/samples/sample_1/pipeline.json | 2 +- pipeline/samples/sample_1/pipeline.yml | 2 +- pipeline/samples/sample_10_windows/pipeline.json | 2 +- pipeline/samples/sample_10_windows/pipeline.yml | 2 +- pipeline/samples/sample_2/pipeline.json | 2 +- pipeline/samples/sample_3/pipeline.json | 2 +- pipeline/samples/sample_3/pipeline.yml | 2 +- pipeline/samples/sample_4/pipeline.json | 2 +- pipeline/samples/sample_4/pipeline.yml | 2 +- pipeline/samples/sample_5/pipeline.json | 2 +- pipeline/samples/sample_5/pipeline.yml | 2 +- pipeline/samples/sample_6/pipeline.json | 2 +- pipeline/samples/sample_6/pipeline.yml | 2 +- pipeline/samples/sample_8_network_mode/pipeline.json | 2 +- pipeline/samples/sample_8_network_mode/pipeline.yml | 2 +- pipeline/samples/sample_9_cache/pipeline.json | 2 +- 18 files changed, 23 insertions(+), 22 deletions(-) diff --git a/docs/docs/20-usage/20-pipeline-syntax.md b/docs/docs/20-usage/20-pipeline-syntax.md index be167bbf7..4c84318f3 100644 --- a/docs/docs/20-usage/20-pipeline-syntax.md +++ b/docs/docs/20-usage/20-pipeline-syntax.md @@ -505,7 +505,7 @@ Woodpecker automatically configures a default clone step if not explicitly defin ```diff +clone: + git: -+ image: plugins/git ++ image: woodpeckerci/plugin-git pipeline: build: @@ -520,7 +520,7 @@ Example configuration to override depth: ```diff clone: git: - image: plugins/git + image: woodpeckerci/plugin-git + depth: 50 ``` @@ -557,7 +557,7 @@ To use the ssh git url in `.gitmodules` for users cloning with ssh, and also use ```diff clone: git: - image: plugins/git + image: woodpeckerci/plugin-git recursive: true + submodule_override: + my-module: https://github.com/octocat/my-module.git diff --git a/pipeline/frontend/yaml/compiler/compiler.go b/pipeline/frontend/yaml/compiler/compiler.go index bb4ba84b1..c574f5444 100644 --- a/pipeline/frontend/yaml/compiler/compiler.go +++ b/pipeline/frontend/yaml/compiler/compiler.go @@ -106,12 +106,13 @@ func (c *Compiler) Compile(conf *yaml.Config) *backend.Config { } // add default clone step - if c.local == false && len(conf.Clone.Containers) == 0 && !conf.SkipClone { + if !c.local && len(conf.Clone.Containers) == 0 && !conf.SkipClone { container := &yaml.Container{ Name: "clone", - Image: "plugins/git:latest", + Image: "woodpeckerci/plugin-git:latest", Vargs: map[string]interface{}{"depth": "0"}, } + // TODO: migrate to woodpeckerci/plugin-git:latest (multi arch) switch c.metadata.Sys.Arch { case "linux/arm": container.Image = "plugins/git:linux-arm" @@ -127,7 +128,7 @@ func (c *Compiler) Compile(conf *yaml.Config) *backend.Config { stage.Steps = append(stage.Steps, step) config.Stages = append(config.Stages, stage) - } else if c.local == false && !conf.SkipClone { + } else if !c.local && !conf.SkipClone { for i, container := range conf.Clone.Containers { if !container.Constraints.Match(c.metadata) { continue diff --git a/pipeline/samples/sample_1/pipeline.json b/pipeline/samples/sample_1/pipeline.json index 98df7cac0..9897cf5fc 100644 --- a/pipeline/samples/sample_1/pipeline.json +++ b/pipeline/samples/sample_1/pipeline.json @@ -7,7 +7,7 @@ { "name": "pipeline_clone_0", "alias": "git", - "image": "plugins/git:latest", + "image": "woodpeckerci/plugin-git:latest", "working_dir": "/go/src/github.com/drone/envsubst", "environment": { "CI": "pipec", diff --git a/pipeline/samples/sample_1/pipeline.yml b/pipeline/samples/sample_1/pipeline.yml index 150c3fde1..34c7700df 100644 --- a/pipeline/samples/sample_1/pipeline.yml +++ b/pipeline/samples/sample_1/pipeline.yml @@ -4,7 +4,7 @@ workspace: clone: git: - image: plugins/git + image: woodpeckerci/plugin-git depth: 50 pipeline: diff --git a/pipeline/samples/sample_10_windows/pipeline.json b/pipeline/samples/sample_10_windows/pipeline.json index 7d345169b..fa7f57382 100644 --- a/pipeline/samples/sample_10_windows/pipeline.json +++ b/pipeline/samples/sample_10_windows/pipeline.json @@ -7,7 +7,7 @@ { "name": "pipeline_clone_0", "alias": "git", - "image": "plugins/git:windows", + "image": "woodpeckerci/plugin-git:windows", "working_dir": "c:\\gopath/src\\github.com\\drone\\envsubst", "environment": { "CI": "drone", diff --git a/pipeline/samples/sample_10_windows/pipeline.yml b/pipeline/samples/sample_10_windows/pipeline.yml index 72b6dea2a..fd595bd39 100644 --- a/pipeline/samples/sample_10_windows/pipeline.yml +++ b/pipeline/samples/sample_10_windows/pipeline.yml @@ -6,7 +6,7 @@ workspace: clone: git: - image: plugins/git:windows + image: woodpeckerci/plugin-git:windows depth: 50 pipeline: diff --git a/pipeline/samples/sample_2/pipeline.json b/pipeline/samples/sample_2/pipeline.json index af52677ce..cf931d3ae 100644 --- a/pipeline/samples/sample_2/pipeline.json +++ b/pipeline/samples/sample_2/pipeline.json @@ -6,7 +6,7 @@ "steps": [ { "name": "pipeline_clone", - "image": "plugins/git:latest", + "image": "woodpeckerci/plugin-git:latest", "working_dir": "/go/src/github.com/go-sql-driver/mysql", "environment": { "CI": "pipec", diff --git a/pipeline/samples/sample_3/pipeline.json b/pipeline/samples/sample_3/pipeline.json index 23486386b..910dc9542 100644 --- a/pipeline/samples/sample_3/pipeline.json +++ b/pipeline/samples/sample_3/pipeline.json @@ -7,7 +7,7 @@ { "name": "pipeline_clone_0", "alias": "git", - "image": "plugins/git:latest", + "image": "woodpeckerci/plugin-git:latest", "working_dir": "/go/src/github.com/drone/envsubst", "environment": { "CI": "pipec", diff --git a/pipeline/samples/sample_3/pipeline.yml b/pipeline/samples/sample_3/pipeline.yml index 0df76858b..b7903527b 100644 --- a/pipeline/samples/sample_3/pipeline.yml +++ b/pipeline/samples/sample_3/pipeline.yml @@ -4,7 +4,7 @@ workspace: clone: git: - image: plugins/git + image: woodpeckerci/plugin-git depth: 50 pipeline: diff --git a/pipeline/samples/sample_4/pipeline.json b/pipeline/samples/sample_4/pipeline.json index 91c09b2c4..5c50b1c88 100644 --- a/pipeline/samples/sample_4/pipeline.json +++ b/pipeline/samples/sample_4/pipeline.json @@ -7,7 +7,7 @@ { "name": "pipeline_clone_0", "alias": "git", - "image": "plugins/git:latest", + "image": "woodpeckerci/plugin-git:latest", "working_dir": "/go/src/github.com/drone/envsubst", "environment": { "CI": "pipec", diff --git a/pipeline/samples/sample_4/pipeline.yml b/pipeline/samples/sample_4/pipeline.yml index 1501f0800..a3aa144ca 100644 --- a/pipeline/samples/sample_4/pipeline.yml +++ b/pipeline/samples/sample_4/pipeline.yml @@ -4,7 +4,7 @@ workspace: clone: git: - image: plugins/git + image: woodpeckerci/plugin-git depth: 50 pipeline: diff --git a/pipeline/samples/sample_5/pipeline.json b/pipeline/samples/sample_5/pipeline.json index e426c4944..b7b5b4b16 100644 --- a/pipeline/samples/sample_5/pipeline.json +++ b/pipeline/samples/sample_5/pipeline.json @@ -7,7 +7,7 @@ { "name": "pipeline_clone_0", "alias": "git", - "image": "plugins/git:latest", + "image": "woodpeckerci/plugin-git:latest", "working_dir": "/go/src/github.com/drone/envsubst", "environment": { "CI": "pipec", diff --git a/pipeline/samples/sample_5/pipeline.yml b/pipeline/samples/sample_5/pipeline.yml index 22d9b17d3..e8c935084 100644 --- a/pipeline/samples/sample_5/pipeline.yml +++ b/pipeline/samples/sample_5/pipeline.yml @@ -4,7 +4,7 @@ workspace: clone: git: - image: plugins/git + image: woodpeckerci/plugin-git depth: 50 pipeline: diff --git a/pipeline/samples/sample_6/pipeline.json b/pipeline/samples/sample_6/pipeline.json index b05c14377..d33b23a15 100644 --- a/pipeline/samples/sample_6/pipeline.json +++ b/pipeline/samples/sample_6/pipeline.json @@ -7,7 +7,7 @@ { "name": "pipeline_clone_0", "alias": "git", - "image": "plugins/git:latest", + "image": "woodpeckerci/plugin-git:latest", "working_dir": "/go/src/github.com/drone/envsubst", "environment": { "CI": "drone", diff --git a/pipeline/samples/sample_6/pipeline.yml b/pipeline/samples/sample_6/pipeline.yml index cd3e5a22e..fe2ae7ce6 100644 --- a/pipeline/samples/sample_6/pipeline.yml +++ b/pipeline/samples/sample_6/pipeline.yml @@ -4,7 +4,7 @@ workspace: clone: git: - image: plugins/git + image: woodpeckerci/plugin-git depth: 50 pipeline: diff --git a/pipeline/samples/sample_8_network_mode/pipeline.json b/pipeline/samples/sample_8_network_mode/pipeline.json index d6cef1fe4..86c4b895c 100644 --- a/pipeline/samples/sample_8_network_mode/pipeline.json +++ b/pipeline/samples/sample_8_network_mode/pipeline.json @@ -7,7 +7,7 @@ { "name": "pipeline_clone_0", "alias": "git", - "image": "plugins/git:latest", + "image": "woodpeckerci/plugin-git:latest", "working_dir": "/go/src/github.com/drone/envsubst", "environment": { "CI": "drone", diff --git a/pipeline/samples/sample_8_network_mode/pipeline.yml b/pipeline/samples/sample_8_network_mode/pipeline.yml index b9705ae74..24b120734 100644 --- a/pipeline/samples/sample_8_network_mode/pipeline.yml +++ b/pipeline/samples/sample_8_network_mode/pipeline.yml @@ -4,7 +4,7 @@ workspace: clone: git: - image: plugins/git + image: woodpeckerci/plugin-git depth: 50 pipeline: diff --git a/pipeline/samples/sample_9_cache/pipeline.json b/pipeline/samples/sample_9_cache/pipeline.json index dc05f2814..a6f2fb3d7 100644 --- a/pipeline/samples/sample_9_cache/pipeline.json +++ b/pipeline/samples/sample_9_cache/pipeline.json @@ -7,7 +7,7 @@ { "name": "pipeline_clone", "alias": "clone", - "image": "plugins/git:latest", + "image": "woodpeckerci/plugin-git:latest", "working_dir": "/pipeline/src", "environment": { "CI": "drone",