self-hosted/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-10-30 23:27:39 +02:00
Code Issues Releases Activity

Remove workflow version again (#3052)

Browse Source
This commit is contained in:
qwerty287
2023-12-28 14:34:13 +01:00
committed by GitHub
parent 4bc2fed550
commit 7e2ea306c4
34 changed files with 2 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.woodpecker/binaries.yml
View File

@@ -1,5 +1,3 @@
version: 1
depends_on:
- test
- web

2
.woodpecker/docker.yml
View File

@@ -1,5 +1,3 @@
version: 1
when:
- event: [pull_request, tag]
- event: push

2
.woodpecker/docs.yml
View File

@@ -1,5 +1,3 @@
version: 1
when:
- event: tag
- event: pull_request

2
.woodpecker/release-helper.yml
View File

@@ -1,5 +1,3 @@
version: 1
steps:
release-helper:
image: woodpeckerci/plugin-ready-release-go:1.0.3

2
.woodpecker/securityscan.yml
View File

@@ -1,5 +1,3 @@
version: 1
when:
- event: [pull_request, cron]
- event: push

2
.woodpecker/test.yml
View File

@@ -1,5 +1,3 @@
version: 1
when:
- event: [pull_request, tag]
- event: push

2
.woodpecker/web.yml
View File

@@ -1,5 +1,3 @@
version: 1
when:
- event: [pull_request, tag]
- event: push

1
contrib/woodpecker-test-repo/.woodpecker/demo.yml
View File

@@ -1,4 +1,3 @@
version: 1
steps:
demo:
image: 'alpine'

1
contrib/woodpecker-test-repo/.woodpecker/test.yml
View File

@@ -1,4 +1,3 @@
version: 1
steps:
test_1:
image: 'alpine'

5
pipeline/frontend/yaml/linter/linter_test.go
View File

@@ -27,7 +27,6 @@ import (
func TestLint(t *testing.T) {
testdatas := []struct{ Title, Data string }{{
Title: "map", Data: `
version: 1
steps:
build:
image: docker
@@ -47,7 +46,6 @@ services:
`,
}, {
Title: "list", Data: `
version: 1
steps:
- name: build
image: docker
@@ -67,7 +65,6 @@ services:
`,
}, {
Title: "merge maps", Data: `
version: 1
variables:
step_template: &base-step
image: golang:1.19
@@ -162,7 +159,7 @@ func TestLintErrors(t *testing.T) {
}
for _, test := range testdata {
conf, err := yaml.ParseString("version: 1\n" + test.from)
conf, err := yaml.ParseString(test.from)
if err != nil {
t.Fatalf("Cannot unmarshal yaml %q. Error: %s", test.from, err)
}

2
pipeline/frontend/yaml/linter/schema/.woodpecker/test-branches-array.yml
View File

@@ -1,5 +1,3 @@
version: 1
branches: [main, pages]
steps:

2
pipeline/frontend/yaml/linter/schema/.woodpecker/test-branches-exclude-include.yml
View File

@@ -1,5 +1,3 @@
version: 1
branches:
include: main
exclude: [develop, feature/*]

2
pipeline/frontend/yaml/linter/schema/.woodpecker/test-branches.yml
View File

@@ -1,5 +1,3 @@
version: 1
branches: main
steps:

2
pipeline/frontend/yaml/linter/schema/.woodpecker/test-broken.yml
View File

@@ -1,5 +1,3 @@
version: 1
branches: main
matri:

2
pipeline/frontend/yaml/linter/schema/.woodpecker/test-clone-skip.yml
View File

@@ -1,5 +1,3 @@
version: 1
steps:
test:
image: alpine

2
pipeline/frontend/yaml/linter/schema/.woodpecker/test-clone.yml
View File

@@ -1,5 +1,3 @@
version: 1
clone:
git:
image: plugins/git:next

2
pipeline/frontend/yaml/linter/schema/.woodpecker/test-labels.yml
View File

@@ -1,5 +1,3 @@
version: 1
labels:
location: europe
weather: sun

2
pipeline/frontend/yaml/linter/schema/.woodpecker/test-matrix.yml
View File

@@ -1,5 +1,3 @@
version: 1
steps:
test:
image: golang:${GO_VERSION}

2
pipeline/frontend/yaml/linter/schema/.woodpecker/test-merge-map-and-sequence.yml
View File

@@ -1,5 +1,3 @@
version: 1
variables:
step_template: &base-step
image: golang:1.19

2
pipeline/frontend/yaml/linter/schema/.woodpecker/test-multi.yml
View File

@@ -1,5 +1,3 @@
version: 1
steps:
deploy:
image: golang

2
pipeline/frontend/yaml/linter/schema/.woodpecker/test-pipeline-when.yml
View File

@@ -1,5 +1,3 @@
version: 1
when:
- branch: [main, deploy]
event: push

2
pipeline/frontend/yaml/linter/schema/.woodpecker/test-platform.yml
View File

@@ -1,5 +1,3 @@
version: 1
platform: linux/amd64
steps:

2
pipeline/frontend/yaml/linter/schema/.woodpecker/test-plugin.yml
View File

@@ -1,5 +1,3 @@
version: 1
steps:
build:
image: golang

2
pipeline/frontend/yaml/linter/schema/.woodpecker/test-run-on.yml
View File

@@ -1,5 +1,3 @@
version: 1
steps:
build:
image: golang

2
pipeline/frontend/yaml/linter/schema/.woodpecker/test-service.yml
View File

@@ -1,5 +1,3 @@
version: 1
steps:
build:
image: golang

2
pipeline/frontend/yaml/linter/schema/.woodpecker/test-step.yml
View File

@@ -1,5 +1,3 @@
version: 1
steps:
image:
image: golang

2
pipeline/frontend/yaml/linter/schema/.woodpecker/test-when.yml
View File

@@ -1,5 +1,3 @@
version: 1
steps:
when-branch:
image: alpine

2
pipeline/frontend/yaml/linter/schema/.woodpecker/test-workspace.yml
View File

@@ -1,5 +1,3 @@
version: 1
workspace:
base: /go
path: src/github.com/octocat/hello-world

30
pipeline/frontend/yaml/parse.go
View File

@@ -15,7 +15,6 @@
package yaml
import (
"errors"
"fmt"
"codeberg.org/6543/xyaml"
@@ -23,27 +22,16 @@ import (
"go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/constraint"
"go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types"
"go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types/base"
"go.woodpecker-ci.org/woodpecker/v2/shared/constant"
)
var ErrUnsuportedVersion = errors.New("unsuported pipeline config version detected")
// ParseBytes parses the configuration from bytes b.
func ParseBytes(b []byte) (*types.Workflow, error) {
yamlVersion, err := checkVersion(b)
if err != nil {
return nil, err
}
out := new(types.Workflow)
err = xyaml.Unmarshal(b, out)
err := xyaml.Unmarshal(b, out)
if err != nil {
return nil, err
}
// make sure detected version is set
out.Version = yamlVersion
// support deprecated branch filter
if out.BranchesDontUseIt != nil {
if out.When.Constraints == nil {
@@ -82,19 +70,3 @@ func ParseString(s string) (*types.Workflow, error) {
[]byte(s),
)
}
func checkVersion(b []byte) (int, error) {
ver := struct {
Version int `yaml:"version"`
}{}
_ = xyaml.Unmarshal(b, &ver)
if ver.Version == 0 {
// default: version 1
return constant.DefaultPipelineVersion, nil
}
if ver.Version != Version {
return 0, ErrUnsuportedVersion
}
return ver.Version, nil
}

19
pipeline/frontend/yaml/parse_test.go
View File

@@ -88,16 +88,6 @@ func TestParse(t *testing.T) {
g.Assert(out.Steps.ContainerList[1].When.Constraints[0].Event.Include).Equal([]string{"success"})
})
g.It("Should unmarshal with default version", func() {
out, err := ParseString(sampleYamlDefaultVersion)
if err != nil {
g.Fail(err)
}
g.Assert(len(out.Steps.ContainerList)).Equal(1)
g.Assert(out.Steps.ContainerList[0].Name).Equal("notify_success")
g.Assert(out.Steps.ContainerList[0].Image).Equal("xyz")
})
matchConfig, err := ParseString(sampleYaml)
if err != nil {
g.Fail(err)
@@ -190,7 +180,6 @@ pipeline:
}
var sampleYaml = `
version: 1
image: hello-world
when:
- event:
@@ -242,14 +231,7 @@ runs_on:
- failure
`
var sampleYamlDefaultVersion = `
steps:
- name: notify_success
image: xyz
`
var simpleYamlAnchors = `
version: 1
vars:
image: &image plugins/slack
steps:
@@ -258,7 +240,6 @@ steps:
`
var sampleVarYaml = `
version: 1
_slack: &SLACK
image: plugins/slack
steps:

1
pipeline/frontend/yaml/types/workflow.go
View File

@@ -31,7 +31,6 @@ type (
DependsOn []string `yaml:"depends_on,omitempty"`
RunsOn []string `yaml:"runs_on,omitempty"`
SkipClone bool `yaml:"skip_clone"`
Version int `yaml:"version"`
// Undocumented
Cache base.StringOrSlice `yaml:"cache,omitempty"`

18
pipeline/frontend/yaml/version.go
View File

@@ -1,18 +0,0 @@
// Copyright 2023 Woodpecker Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package yaml
// Version of this package and it's subpackages
const Version = 1

25
pipeline/stepBuilder_test.go
View File

@@ -47,7 +47,6 @@ func TestGlobalEnvsubst(t *testing.T) {
Host: "",
Yamls: []*forge_types.FileMeta{
{Data: []byte(`
version: 1
steps:
build:
image: ${IMAGE}
@@ -84,7 +83,6 @@ func TestMissingGlobalEnvsubst(t *testing.T) {
Host: "",
Yamls: []*forge_types.FileMeta{
{Data: []byte(`
version: 1
steps:
build:
image: ${IMAGE}
@@ -118,7 +116,6 @@ bbb`,
Host: "",
Yamls: []*forge_types.FileMeta{
{Data: []byte(`
version: 1
steps:
xxx:
image: scratch
@@ -126,7 +123,6 @@ steps:
yyy: ${CI_COMMIT_MESSAGE}
`)},
{Data: []byte(`
version: 1
steps:
build:
image: scratch
@@ -157,13 +153,11 @@ func TestMultiPipeline(t *testing.T) {
Host: "",
Yamls: []*forge_types.FileMeta{
{Data: []byte(`
version: 1
steps:
xxx:
image: scratch
`)},
{Data: []byte(`
version: 1
steps:
build:
image: scratch
@@ -194,19 +188,16 @@ func TestDependsOn(t *testing.T) {
Host: "",
Yamls: []*forge_types.FileMeta{
{Name: "lint", Data: []byte(`
version: 1
steps:
build:
image: scratch
`)},
{Name: "test", Data: []byte(`
version: 1
steps:
build:
image: scratch
`)},
{Data: []byte(`
version: 1
steps:
deploy:
image: scratch
@@ -244,7 +235,6 @@ func TestRunsOn(t *testing.T) {
Host: "",
Yamls: []*forge_types.FileMeta{
{Data: []byte(`
version: 1
steps:
deploy:
image: scratch
@@ -282,13 +272,11 @@ func TestPipelineName(t *testing.T) {
Host: "",
Yamls: []*forge_types.FileMeta{
{Name: ".woodpecker/lint.yml", Data: []byte(`
version: 1
steps:
build:
image: scratch
`)},
{Name: ".woodpecker/.test.yml", Data: []byte(`
version: 1
steps:
build:
image: scratch
@@ -320,14 +308,12 @@ func TestBranchFilter(t *testing.T) {
Host: "",
Yamls: []*forge_types.FileMeta{
{Data: []byte(`
version: 1
steps:
xxx:
image: scratch
branches: main
`)},
{Data: []byte(`
version: 1
steps:
build:
image: scratch
@@ -361,7 +347,6 @@ func TestRootWhenFilter(t *testing.T) {
Host: "",
Yamls: []*forge_types.FileMeta{
{Data: []byte(`
version: 1
when:
event:
- tag
@@ -370,7 +355,6 @@ steps:
image: scratch
`)},
{Data: []byte(`
version: 1
when:
event:
- push
@@ -379,7 +363,6 @@ steps:
image: scratch
`)},
{Data: []byte(`
version: 1
steps:
build:
image: scratch
@@ -413,7 +396,6 @@ func TestZeroSteps(t *testing.T) {
Host: "",
Yamls: []*forge_types.FileMeta{
{Data: []byte(`
version: 1
skip_clone: true
steps:
build:
@@ -449,7 +431,6 @@ func TestZeroStepsAsMultiPipelineDeps(t *testing.T) {
Host: "",
Yamls: []*forge_types.FileMeta{
{Name: "zerostep", Data: []byte(`
version: 1
skip_clone: true
steps:
build:
@@ -458,13 +439,11 @@ steps:
image: scratch
`)},
{Name: "justastep", Data: []byte(`
version: 1
steps:
build:
image: scratch
`)},
{Name: "shouldbefiltered", Data: []byte(`
version: 1
steps:
build:
image: scratch
@@ -501,7 +480,6 @@ func TestZeroStepsAsMultiPipelineTransitiveDeps(t *testing.T) {
Host: "",
Yamls: []*forge_types.FileMeta{
{Name: "zerostep", Data: []byte(`
version: 1
skip_clone: true
steps:
build:
@@ -510,20 +488,17 @@ steps:
image: scratch
`)},
{Name: "justastep", Data: []byte(`
version: 1
steps:
build:
image: scratch
`)},
{Name: "shouldbefiltered", Data: []byte(`
version: 1
steps:
build:
image: scratch
depends_on: [ zerostep ]
`)},
{Name: "shouldbefilteredtoo", Data: []byte(`
version: 1
steps:
build:
image: scratch

2
shared/constant/constant.go
View File

@@ -40,5 +40,3 @@ var TrustedCloneImages = []string{
DefaultCloneImage,
"quay.io/woodpeckerci/plugin-git",
}
const DefaultPipelineVersion = 1