Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove workflow version again #3052

Merged
merged 2 commits into from
Dec 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .woodpecker/binaries.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: 1

depends_on:
- test
- web
Expand Down
2 changes: 0 additions & 2 deletions .woodpecker/docker.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: 1

when:
- event: [pull_request, tag]
- event: push
Expand Down
2 changes: 0 additions & 2 deletions .woodpecker/docs.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: 1

when:
- event: tag
- event: pull_request
Expand Down
2 changes: 0 additions & 2 deletions .woodpecker/release-helper.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: 1

steps:
release-helper:
image: woodpeckerci/plugin-ready-release-go:1.0.3
Expand Down
2 changes: 0 additions & 2 deletions .woodpecker/securityscan.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: 1

when:
- event: [pull_request, cron]
- event: push
Expand Down
2 changes: 0 additions & 2 deletions .woodpecker/test.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: 1

when:
- event: [pull_request, tag]
- event: push
Expand Down
2 changes: 0 additions & 2 deletions .woodpecker/web.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: 1

when:
- event: [pull_request, tag]
- event: push
Expand Down
1 change: 0 additions & 1 deletion contrib/woodpecker-test-repo/.woodpecker/demo.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: 1
steps:
demo:
image: 'alpine'
Expand Down
1 change: 0 additions & 1 deletion contrib/woodpecker-test-repo/.woodpecker/test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: 1
steps:
test_1:
image: 'alpine'
Expand Down
5 changes: 1 addition & 4 deletions pipeline/frontend/yaml/linter/linter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import (
func TestLint(t *testing.T) {
testdatas := []struct{ Title, Data string }{{
Title: "map", Data: `
version: 1
steps:
build:
image: docker
Expand All @@ -47,7 +46,6 @@ services:
`,
}, {
Title: "list", Data: `
version: 1
steps:
- name: build
image: docker
Expand All @@ -67,7 +65,6 @@ services:
`,
}, {
Title: "merge maps", Data: `
version: 1
variables:
step_template: &base-step
image: golang:1.19
Expand Down Expand Up @@ -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)
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: 1

branches: [main, pages]

steps:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: 1

branches:
include: main
exclude: [develop, feature/*]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: 1

branches: main

steps:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: 1

branches: main

matri:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: 1

steps:
test:
image: alpine
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: 1

clone:
git:
image: plugins/git:next
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: 1

labels:
location: europe
weather: sun
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: 1

steps:
test:
image: golang:${GO_VERSION}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: 1

variables:
step_template: &base-step
image: golang:1.19
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: 1

steps:
deploy:
image: golang
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: 1

when:
- branch: [main, deploy]
event: push
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: 1

platform: linux/amd64

steps:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: 1

steps:
build:
image: golang
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: 1

steps:
build:
image: golang
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: 1

steps:
build:
image: golang
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: 1

steps:
image:
image: golang
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: 1

steps:
when-branch:
image: alpine
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: 1

workspace:
base: /go
path: src/github.com/octocat/hello-world
Expand Down
30 changes: 1 addition & 29 deletions pipeline/frontend/yaml/parse.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,35 +15,23 @@
package yaml

import (
"errors"
"fmt"

"codeberg.org/6543/xyaml"

"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 {
Expand Down Expand Up @@ -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 changes: 0 additions & 19 deletions pipeline/frontend/yaml/parse_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -190,7 +180,6 @@ pipeline:
}

var sampleYaml = `
version: 1
image: hello-world
when:
- event:
Expand Down Expand Up @@ -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:
Expand All @@ -258,7 +240,6 @@ steps:
`

var sampleVarYaml = `
version: 1
_slack: &SLACK
image: plugins/slack
steps:
Expand Down
1 change: 0 additions & 1 deletion pipeline/frontend/yaml/types/workflow.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down
18 changes: 0 additions & 18 deletions pipeline/frontend/yaml/version.go

This file was deleted.

Loading