diff --git a/agent/runner.go b/agent/runner.go index 89f428c28..76e9f3b55 100644 --- a/agent/runner.go +++ b/agent/runner.go @@ -25,10 +25,10 @@ import ( "google.golang.org/grpc/metadata" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/multipart" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/rpc" + "github.com/woodpecker-ci/woodpecker/pipeline" + "github.com/woodpecker-ci/woodpecker/pipeline/backend" + "github.com/woodpecker-ci/woodpecker/pipeline/multipart" + "github.com/woodpecker-ci/woodpecker/pipeline/rpc" "github.com/rs/zerolog/log" "github.com/tevino/abool" diff --git a/cli/exec/exec.go b/cli/exec/exec.go index fe1ad5184..34a4571f1 100644 --- a/cli/exec/exec.go +++ b/cli/exec/exec.go @@ -13,16 +13,16 @@ import ( "time" "github.com/drone/envsubst" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend/docker" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml/compiler" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml/linter" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml/matrix" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/interrupt" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/multipart" + "github.com/woodpecker-ci/woodpecker/pipeline" + "github.com/woodpecker-ci/woodpecker/pipeline/backend" + "github.com/woodpecker-ci/woodpecker/pipeline/backend/docker" + "github.com/woodpecker-ci/woodpecker/pipeline/frontend" + "github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml" + "github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml/compiler" + "github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml/linter" + "github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml/matrix" + "github.com/woodpecker-ci/woodpecker/pipeline/interrupt" + "github.com/woodpecker-ci/woodpecker/pipeline/multipart" "github.com/urfave/cli" ) diff --git a/cmd/agent/agent.go b/cmd/agent/agent.go index 7d29e4590..c76829552 100644 --- a/cmd/agent/agent.go +++ b/cmd/agent/agent.go @@ -28,8 +28,8 @@ import ( "google.golang.org/grpc/metadata" "github.com/woodpecker-ci/woodpecker/agent" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend/docker" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/rpc" + "github.com/woodpecker-ci/woodpecker/pipeline/backend/docker" + "github.com/woodpecker-ci/woodpecker/pipeline/rpc" "github.com/rs/zerolog" "github.com/rs/zerolog/log" diff --git a/cmd/server/server.go b/cmd/server/server.go index 85342541c..38cee5a7c 100644 --- a/cmd/server/server.go +++ b/cmd/server/server.go @@ -33,7 +33,7 @@ import ( "golang.org/x/crypto/acme/autocert" "golang.org/x/sync/errgroup" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/rpc/proto" + "github.com/woodpecker-ci/woodpecker/pipeline/rpc/proto" "github.com/woodpecker-ci/woodpecker/server" woodpeckerGrpcServer "github.com/woodpecker-ci/woodpecker/server/grpc" "github.com/woodpecker-ci/woodpecker/server/logging" diff --git a/cncd/pipeline/.drone.yml b/cncd/pipeline/.drone.yml deleted file mode 100644 index 89da6f434..000000000 --- a/cncd/pipeline/.drone.yml +++ /dev/null @@ -1,15 +0,0 @@ -workspace: - base: /go - path: src/github.com/woodpecker-ci/woodpecker/cncd/pipeline - -pipeline: - install: - image: golang:1.8 - commands: - - go install github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipec - - go install github.com/woodpecker-ci/woodpecker/cncd/pipeline/piped - - test: - image: golang:1.8 - commands: - - go test -cover -timeout 30s github.com/woodpecker-ci/woodpecker/cncd/pipeline/... diff --git a/cncd/pipeline/.gitignore b/cncd/pipeline/.gitignore deleted file mode 100644 index 374300b48..000000000 --- a/cncd/pipeline/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.txt -*.out diff --git a/cncd/pipeline/pipeline/backend/backend.go b/pipeline/backend/backend.go similarity index 100% rename from cncd/pipeline/pipeline/backend/backend.go rename to pipeline/backend/backend.go diff --git a/cncd/pipeline/pipeline/backend/docker/convert.go b/pipeline/backend/docker/convert.go similarity index 98% rename from cncd/pipeline/pipeline/backend/docker/convert.go rename to pipeline/backend/docker/convert.go index 56b1657e5..9bf0075e7 100644 --- a/cncd/pipeline/pipeline/backend/docker/convert.go +++ b/pipeline/backend/docker/convert.go @@ -7,7 +7,7 @@ import ( "regexp" "strings" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend" + "github.com/woodpecker-ci/woodpecker/pipeline/backend" ) // returns a container configuration. diff --git a/cncd/pipeline/pipeline/backend/docker/convert_test.go b/pipeline/backend/docker/convert_test.go similarity index 100% rename from cncd/pipeline/pipeline/backend/docker/convert_test.go rename to pipeline/backend/docker/convert_test.go diff --git a/cncd/pipeline/pipeline/backend/docker/docker.go b/pipeline/backend/docker/docker.go similarity index 98% rename from cncd/pipeline/pipeline/backend/docker/docker.go rename to pipeline/backend/docker/docker.go index 0bcdefbf6..2e06defaa 100644 --- a/cncd/pipeline/pipeline/backend/docker/docker.go +++ b/pipeline/backend/docker/docker.go @@ -8,7 +8,7 @@ import ( "io" "os" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend" + "github.com/woodpecker-ci/woodpecker/pipeline/backend" "docker.io/go-docker" "docker.io/go-docker/api/types" diff --git a/cncd/pipeline/pipeline/backend/docker/pool.go b/pipeline/backend/docker/pool.go similarity index 92% rename from cncd/pipeline/pipeline/backend/docker/pool.go rename to pipeline/backend/docker/pool.go index 0de6f8bd0..8160bc114 100644 --- a/cncd/pipeline/pipeline/backend/docker/pool.go +++ b/pipeline/backend/docker/pool.go @@ -3,7 +3,7 @@ package docker // import ( // "context" // -// "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend" +// "github.com/woodpecker-ci/woodpecker/pipeline/backend" // ) // // // Pool manages a pool of Docker clients. diff --git a/cncd/pipeline/pipeline/backend/kubernetes/kubernetes.go b/pipeline/backend/kubernetes/kubernetes.go similarity index 95% rename from cncd/pipeline/pipeline/backend/kubernetes/kubernetes.go rename to pipeline/backend/kubernetes/kubernetes.go index 0ad6331c8..226208e0b 100644 --- a/cncd/pipeline/pipeline/backend/kubernetes/kubernetes.go +++ b/pipeline/backend/kubernetes/kubernetes.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend" + "github.com/woodpecker-ci/woodpecker/pipeline/backend" ) type engine struct { diff --git a/cncd/pipeline/pipeline/backend/types.go b/pipeline/backend/types.go similarity index 100% rename from cncd/pipeline/pipeline/backend/types.go rename to pipeline/backend/types.go diff --git a/cncd/pipeline/doc.go b/pipeline/doc.go similarity index 100% rename from cncd/pipeline/doc.go rename to pipeline/doc.go diff --git a/cncd/pipeline/pipeline/error.go b/pipeline/error.go similarity index 100% rename from cncd/pipeline/pipeline/error.go rename to pipeline/error.go diff --git a/cncd/pipeline/pipeline/error_test.go b/pipeline/error_test.go similarity index 100% rename from cncd/pipeline/pipeline/error_test.go rename to pipeline/error_test.go diff --git a/cncd/pipeline/pipeline/frontend/metadata.go b/pipeline/frontend/metadata.go similarity index 100% rename from cncd/pipeline/pipeline/frontend/metadata.go rename to pipeline/frontend/metadata.go diff --git a/cncd/pipeline/pipeline/frontend/metadata_test.go b/pipeline/frontend/metadata_test.go similarity index 100% rename from cncd/pipeline/pipeline/frontend/metadata_test.go rename to pipeline/frontend/metadata_test.go diff --git a/cncd/pipeline/pipeline/frontend/yaml/compiler/cacher.go b/pipeline/frontend/yaml/compiler/cacher.go similarity index 96% rename from cncd/pipeline/pipeline/frontend/yaml/compiler/cacher.go rename to pipeline/frontend/yaml/compiler/cacher.go index 02605aad4..5b9cd449a 100644 --- a/cncd/pipeline/pipeline/frontend/yaml/compiler/cacher.go +++ b/pipeline/frontend/yaml/compiler/cacher.go @@ -4,7 +4,7 @@ import ( "path" "strings" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml" + "github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml" libcompose "github.com/docker/libcompose/yaml" ) diff --git a/cncd/pipeline/pipeline/frontend/yaml/compiler/compiler.go b/pipeline/frontend/yaml/compiler/compiler.go similarity index 96% rename from cncd/pipeline/pipeline/frontend/yaml/compiler/compiler.go rename to pipeline/frontend/yaml/compiler/compiler.go index 178b38366..bb4ba84b1 100644 --- a/cncd/pipeline/pipeline/frontend/yaml/compiler/compiler.go +++ b/pipeline/frontend/yaml/compiler/compiler.go @@ -3,9 +3,9 @@ package compiler import ( "fmt" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml" + "github.com/woodpecker-ci/woodpecker/pipeline/backend" + "github.com/woodpecker-ci/woodpecker/pipeline/frontend" + "github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml" ) // TODO(bradrydzewski) compiler should handle user-defined volumes from YAML diff --git a/cncd/pipeline/pipeline/frontend/yaml/compiler/compiler_test.go b/pipeline/frontend/yaml/compiler/compiler_test.go similarity index 100% rename from cncd/pipeline/pipeline/frontend/yaml/compiler/compiler_test.go rename to pipeline/frontend/yaml/compiler/compiler_test.go diff --git a/cncd/pipeline/pipeline/frontend/yaml/compiler/convert.go b/pipeline/frontend/yaml/compiler/convert.go similarity index 97% rename from cncd/pipeline/pipeline/frontend/yaml/compiler/convert.go rename to pipeline/frontend/yaml/compiler/convert.go index 25924db7b..115eee5f6 100644 --- a/cncd/pipeline/pipeline/frontend/yaml/compiler/convert.go +++ b/pipeline/frontend/yaml/compiler/convert.go @@ -5,8 +5,8 @@ import ( "path" "strings" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml" + "github.com/woodpecker-ci/woodpecker/pipeline/backend" + "github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml" ) func (c *Compiler) createProcess(name string, container *yaml.Container, section string) *backend.Step { diff --git a/cncd/pipeline/pipeline/frontend/yaml/compiler/convert_test.go b/pipeline/frontend/yaml/compiler/convert_test.go similarity index 100% rename from cncd/pipeline/pipeline/frontend/yaml/compiler/convert_test.go rename to pipeline/frontend/yaml/compiler/convert_test.go diff --git a/cncd/pipeline/pipeline/frontend/yaml/compiler/image.go b/pipeline/frontend/yaml/compiler/image.go similarity index 100% rename from cncd/pipeline/pipeline/frontend/yaml/compiler/image.go rename to pipeline/frontend/yaml/compiler/image.go diff --git a/cncd/pipeline/pipeline/frontend/yaml/compiler/image_test.go b/pipeline/frontend/yaml/compiler/image_test.go similarity index 100% rename from cncd/pipeline/pipeline/frontend/yaml/compiler/image_test.go rename to pipeline/frontend/yaml/compiler/image_test.go diff --git a/cncd/pipeline/pipeline/frontend/yaml/compiler/option.go b/pipeline/frontend/yaml/compiler/option.go similarity index 98% rename from cncd/pipeline/pipeline/frontend/yaml/compiler/option.go rename to pipeline/frontend/yaml/compiler/option.go index 4517efdca..1e7706b2a 100644 --- a/cncd/pipeline/pipeline/frontend/yaml/compiler/option.go +++ b/pipeline/frontend/yaml/compiler/option.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend" + "github.com/woodpecker-ci/woodpecker/pipeline/frontend" ) // Option configures a compiler option. diff --git a/cncd/pipeline/pipeline/frontend/yaml/compiler/option_test.go b/pipeline/frontend/yaml/compiler/option_test.go similarity index 98% rename from cncd/pipeline/pipeline/frontend/yaml/compiler/option_test.go rename to pipeline/frontend/yaml/compiler/option_test.go index e723ba347..b169fb3e3 100644 --- a/cncd/pipeline/pipeline/frontend/yaml/compiler/option_test.go +++ b/pipeline/frontend/yaml/compiler/option_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend" + "github.com/woodpecker-ci/woodpecker/pipeline/frontend" ) func TestWithWorkspace(t *testing.T) { diff --git a/cncd/pipeline/pipeline/frontend/yaml/compiler/params.go b/pipeline/frontend/yaml/compiler/params.go similarity index 100% rename from cncd/pipeline/pipeline/frontend/yaml/compiler/params.go rename to pipeline/frontend/yaml/compiler/params.go diff --git a/cncd/pipeline/pipeline/frontend/yaml/compiler/params_test.go b/pipeline/frontend/yaml/compiler/params_test.go similarity index 100% rename from cncd/pipeline/pipeline/frontend/yaml/compiler/params_test.go rename to pipeline/frontend/yaml/compiler/params_test.go diff --git a/cncd/pipeline/pipeline/frontend/yaml/compiler/script_posix.go b/pipeline/frontend/yaml/compiler/script_posix.go similarity index 100% rename from cncd/pipeline/pipeline/frontend/yaml/compiler/script_posix.go rename to pipeline/frontend/yaml/compiler/script_posix.go diff --git a/cncd/pipeline/pipeline/frontend/yaml/compiler/script_posix_test.go b/pipeline/frontend/yaml/compiler/script_posix_test.go similarity index 100% rename from cncd/pipeline/pipeline/frontend/yaml/compiler/script_posix_test.go rename to pipeline/frontend/yaml/compiler/script_posix_test.go diff --git a/cncd/pipeline/pipeline/frontend/yaml/compiler/script_win.go b/pipeline/frontend/yaml/compiler/script_win.go similarity index 100% rename from cncd/pipeline/pipeline/frontend/yaml/compiler/script_win.go rename to pipeline/frontend/yaml/compiler/script_win.go diff --git a/cncd/pipeline/pipeline/frontend/yaml/compiler/script_win_test.go b/pipeline/frontend/yaml/compiler/script_win_test.go similarity index 100% rename from cncd/pipeline/pipeline/frontend/yaml/compiler/script_win_test.go rename to pipeline/frontend/yaml/compiler/script_win_test.go diff --git a/cncd/pipeline/pipeline/frontend/yaml/config.go b/pipeline/frontend/yaml/config.go similarity index 100% rename from cncd/pipeline/pipeline/frontend/yaml/config.go rename to pipeline/frontend/yaml/config.go diff --git a/cncd/pipeline/pipeline/frontend/yaml/config_test.go b/pipeline/frontend/yaml/config_test.go similarity index 100% rename from cncd/pipeline/pipeline/frontend/yaml/config_test.go rename to pipeline/frontend/yaml/config_test.go diff --git a/cncd/pipeline/pipeline/frontend/yaml/constraint.go b/pipeline/frontend/yaml/constraint.go similarity index 97% rename from cncd/pipeline/pipeline/frontend/yaml/constraint.go rename to pipeline/frontend/yaml/constraint.go index 007ee8e4e..a79ccd217 100644 --- a/cncd/pipeline/pipeline/frontend/yaml/constraint.go +++ b/pipeline/frontend/yaml/constraint.go @@ -7,8 +7,8 @@ import ( doublestar "github.com/bmatcuk/doublestar/v4" libcompose "github.com/docker/libcompose/yaml" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml/types" + "github.com/woodpecker-ci/woodpecker/pipeline/frontend" + "github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml/types" "gopkg.in/yaml.v3" ) diff --git a/cncd/pipeline/pipeline/frontend/yaml/constraint_test.go b/pipeline/frontend/yaml/constraint_test.go similarity index 99% rename from cncd/pipeline/pipeline/frontend/yaml/constraint_test.go rename to pipeline/frontend/yaml/constraint_test.go index 7aa0fd81f..12ce9f078 100644 --- a/cncd/pipeline/pipeline/frontend/yaml/constraint_test.go +++ b/pipeline/frontend/yaml/constraint_test.go @@ -3,7 +3,7 @@ package yaml import ( "testing" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend" + "github.com/woodpecker-ci/woodpecker/pipeline/frontend" "gopkg.in/yaml.v3" ) diff --git a/cncd/pipeline/pipeline/frontend/yaml/container.go b/pipeline/frontend/yaml/container.go similarity index 100% rename from cncd/pipeline/pipeline/frontend/yaml/container.go rename to pipeline/frontend/yaml/container.go diff --git a/cncd/pipeline/pipeline/frontend/yaml/container_test.go b/pipeline/frontend/yaml/container_test.go similarity index 100% rename from cncd/pipeline/pipeline/frontend/yaml/container_test.go rename to pipeline/frontend/yaml/container_test.go diff --git a/cncd/pipeline/pipeline/frontend/yaml/linter/linter.go b/pipeline/frontend/yaml/linter/linter.go similarity index 97% rename from cncd/pipeline/pipeline/frontend/yaml/linter/linter.go rename to pipeline/frontend/yaml/linter/linter.go index 61537213b..da0dab378 100644 --- a/cncd/pipeline/pipeline/frontend/yaml/linter/linter.go +++ b/pipeline/frontend/yaml/linter/linter.go @@ -3,7 +3,7 @@ package linter import ( "fmt" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml" + "github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml" ) const ( diff --git a/cncd/pipeline/pipeline/frontend/yaml/linter/linter_test.go b/pipeline/frontend/yaml/linter/linter_test.go similarity index 97% rename from cncd/pipeline/pipeline/frontend/yaml/linter/linter_test.go rename to pipeline/frontend/yaml/linter/linter_test.go index de83571bb..2fcccc038 100644 --- a/cncd/pipeline/pipeline/frontend/yaml/linter/linter_test.go +++ b/pipeline/frontend/yaml/linter/linter_test.go @@ -3,7 +3,7 @@ package linter import ( "testing" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml" + "github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml" ) func TestLint(t *testing.T) { diff --git a/cncd/pipeline/pipeline/frontend/yaml/linter/option.go b/pipeline/frontend/yaml/linter/option.go similarity index 100% rename from cncd/pipeline/pipeline/frontend/yaml/linter/option.go rename to pipeline/frontend/yaml/linter/option.go diff --git a/cncd/pipeline/pipeline/frontend/yaml/matrix/matrix.go b/pipeline/frontend/yaml/matrix/matrix.go similarity index 100% rename from cncd/pipeline/pipeline/frontend/yaml/matrix/matrix.go rename to pipeline/frontend/yaml/matrix/matrix.go diff --git a/cncd/pipeline/pipeline/frontend/yaml/matrix/matrix_test.go b/pipeline/frontend/yaml/matrix/matrix_test.go similarity index 100% rename from cncd/pipeline/pipeline/frontend/yaml/matrix/matrix_test.go rename to pipeline/frontend/yaml/matrix/matrix_test.go diff --git a/cncd/pipeline/pipeline/frontend/yaml/network.go b/pipeline/frontend/yaml/network.go similarity index 100% rename from cncd/pipeline/pipeline/frontend/yaml/network.go rename to pipeline/frontend/yaml/network.go diff --git a/cncd/pipeline/pipeline/frontend/yaml/network_test.go b/pipeline/frontend/yaml/network_test.go similarity index 100% rename from cncd/pipeline/pipeline/frontend/yaml/network_test.go rename to pipeline/frontend/yaml/network_test.go diff --git a/cncd/pipeline/pipeline/frontend/yaml/secret.go b/pipeline/frontend/yaml/secret.go similarity index 100% rename from cncd/pipeline/pipeline/frontend/yaml/secret.go rename to pipeline/frontend/yaml/secret.go diff --git a/cncd/pipeline/pipeline/frontend/yaml/secret_test.go b/pipeline/frontend/yaml/secret_test.go similarity index 100% rename from cncd/pipeline/pipeline/frontend/yaml/secret_test.go rename to pipeline/frontend/yaml/secret_test.go diff --git a/cncd/pipeline/pipeline/frontend/yaml/types/bool.go b/pipeline/frontend/yaml/types/bool.go similarity index 100% rename from cncd/pipeline/pipeline/frontend/yaml/types/bool.go rename to pipeline/frontend/yaml/types/bool.go diff --git a/cncd/pipeline/pipeline/frontend/yaml/types/bool_test.go b/pipeline/frontend/yaml/types/bool_test.go similarity index 100% rename from cncd/pipeline/pipeline/frontend/yaml/types/bool_test.go rename to pipeline/frontend/yaml/types/bool_test.go diff --git a/cncd/pipeline/pipeline/frontend/yaml/volume.go b/pipeline/frontend/yaml/volume.go similarity index 100% rename from cncd/pipeline/pipeline/frontend/yaml/volume.go rename to pipeline/frontend/yaml/volume.go diff --git a/cncd/pipeline/pipeline/frontend/yaml/volume_test.go b/pipeline/frontend/yaml/volume_test.go similarity index 100% rename from cncd/pipeline/pipeline/frontend/yaml/volume_test.go rename to pipeline/frontend/yaml/volume_test.go diff --git a/cncd/pipeline/pipeline/interrupt/interrupt.go b/pipeline/interrupt/interrupt.go similarity index 100% rename from cncd/pipeline/pipeline/interrupt/interrupt.go rename to pipeline/interrupt/interrupt.go diff --git a/cncd/pipeline/pipeline/logger.go b/pipeline/logger.go similarity index 74% rename from cncd/pipeline/pipeline/logger.go rename to pipeline/logger.go index 7401b73aa..cc3b4053f 100644 --- a/cncd/pipeline/pipeline/logger.go +++ b/pipeline/logger.go @@ -1,8 +1,8 @@ package pipeline import ( - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/multipart" + "github.com/woodpecker-ci/woodpecker/pipeline/backend" + "github.com/woodpecker-ci/woodpecker/pipeline/multipart" ) // Logger handles the process logging. diff --git a/cncd/pipeline/pipeline/multipart/analysis/doc.go b/pipeline/multipart/analysis/doc.go similarity index 100% rename from cncd/pipeline/pipeline/multipart/analysis/doc.go rename to pipeline/multipart/analysis/doc.go diff --git a/cncd/pipeline/pipeline/multipart/coverage/coverage.go b/pipeline/multipart/coverage/coverage.go similarity index 100% rename from cncd/pipeline/pipeline/multipart/coverage/coverage.go rename to pipeline/multipart/coverage/coverage.go diff --git a/cncd/pipeline/pipeline/multipart/coverage/doc.go b/pipeline/multipart/coverage/doc.go similarity index 100% rename from cncd/pipeline/pipeline/multipart/coverage/doc.go rename to pipeline/multipart/coverage/doc.go diff --git a/cncd/pipeline/pipeline/multipart/doc.go b/pipeline/multipart/doc.go similarity index 100% rename from cncd/pipeline/pipeline/multipart/doc.go rename to pipeline/multipart/doc.go diff --git a/cncd/pipeline/pipeline/multipart/reader.go b/pipeline/multipart/reader.go similarity index 100% rename from cncd/pipeline/pipeline/multipart/reader.go rename to pipeline/multipart/reader.go diff --git a/cncd/pipeline/pipeline/multipart/reader_test.go b/pipeline/multipart/reader_test.go similarity index 100% rename from cncd/pipeline/pipeline/multipart/reader_test.go rename to pipeline/multipart/reader_test.go diff --git a/cncd/pipeline/pipeline/multipart/selenium/doc.go b/pipeline/multipart/selenium/doc.go similarity index 100% rename from cncd/pipeline/pipeline/multipart/selenium/doc.go rename to pipeline/multipart/selenium/doc.go diff --git a/cncd/pipeline/pipeline/multipart/terminal/doc.go b/pipeline/multipart/terminal/doc.go similarity index 100% rename from cncd/pipeline/pipeline/multipart/terminal/doc.go rename to pipeline/multipart/terminal/doc.go diff --git a/cncd/pipeline/pipeline/option.go b/pipeline/option.go similarity index 91% rename from cncd/pipeline/pipeline/option.go rename to pipeline/option.go index 030d3cbcb..bdbe9c2d7 100644 --- a/cncd/pipeline/pipeline/option.go +++ b/pipeline/option.go @@ -3,7 +3,7 @@ package pipeline import ( "context" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend" + "github.com/woodpecker-ci/woodpecker/pipeline/backend" ) // Option configures a runtime option. diff --git a/cncd/pipeline/pipeline/option_test.go b/pipeline/option_test.go similarity index 100% rename from cncd/pipeline/pipeline/option_test.go rename to pipeline/option_test.go diff --git a/cncd/pipeline/pipeline/parse.go b/pipeline/parse.go similarity index 90% rename from cncd/pipeline/pipeline/parse.go rename to pipeline/parse.go index 1a097b8ed..8354a176e 100644 --- a/cncd/pipeline/pipeline/parse.go +++ b/pipeline/parse.go @@ -6,7 +6,7 @@ import ( "os" "strings" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend" + "github.com/woodpecker-ci/woodpecker/pipeline/backend" ) // Parse parses the pipeline config from an io.Reader. diff --git a/cncd/pipeline/pipeline/parse_test.go b/pipeline/parse_test.go similarity index 100% rename from cncd/pipeline/pipeline/parse_test.go rename to pipeline/parse_test.go diff --git a/cncd/pipeline/pipeline/pipeline.go b/pipeline/pipeline.go similarity index 95% rename from cncd/pipeline/pipeline/pipeline.go rename to pipeline/pipeline.go index 572f03629..11c805e1a 100644 --- a/cncd/pipeline/pipeline/pipeline.go +++ b/pipeline/pipeline.go @@ -6,8 +6,8 @@ import ( "golang.org/x/sync/errgroup" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/multipart" + "github.com/woodpecker-ci/woodpecker/pipeline/backend" + "github.com/woodpecker-ci/woodpecker/pipeline/multipart" ) type ( diff --git a/cncd/pipeline/pipeline/rpc/client_grpc.go b/pipeline/rpc/client_grpc.go similarity index 97% rename from cncd/pipeline/pipeline/rpc/client_grpc.go rename to pipeline/rpc/client_grpc.go index 6015f1a8d..5260e0aa2 100644 --- a/cncd/pipeline/pipeline/rpc/client_grpc.go +++ b/pipeline/rpc/client_grpc.go @@ -6,8 +6,8 @@ import ( "log" "time" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/rpc/proto" + "github.com/woodpecker-ci/woodpecker/pipeline/backend" + "github.com/woodpecker-ci/woodpecker/pipeline/rpc/proto" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/cncd/pipeline/pipeline/rpc/client_grpc_health.go b/pipeline/rpc/client_grpc_health.go similarity index 88% rename from cncd/pipeline/pipeline/rpc/client_grpc_health.go rename to pipeline/rpc/client_grpc_health.go index 3359f70f9..ff8e241cc 100644 --- a/cncd/pipeline/pipeline/rpc/client_grpc_health.go +++ b/pipeline/rpc/client_grpc_health.go @@ -5,8 +5,8 @@ import ( // "encoding/json" "time" - // "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/rpc/proto" + // "github.com/woodpecker-ci/woodpecker/pipeline/backend" + "github.com/woodpecker-ci/woodpecker/pipeline/rpc/proto" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/cncd/pipeline/pipeline/rpc/health.go b/pipeline/rpc/health.go similarity index 100% rename from cncd/pipeline/pipeline/rpc/health.go rename to pipeline/rpc/health.go diff --git a/cncd/pipeline/pipeline/rpc/line.go b/pipeline/rpc/line.go similarity index 100% rename from cncd/pipeline/pipeline/rpc/line.go rename to pipeline/rpc/line.go diff --git a/cncd/pipeline/pipeline/rpc/line_test.go b/pipeline/rpc/line_test.go similarity index 100% rename from cncd/pipeline/pipeline/rpc/line_test.go rename to pipeline/rpc/line_test.go diff --git a/cncd/pipeline/pipeline/rpc/peer.go b/pipeline/rpc/peer.go similarity index 96% rename from cncd/pipeline/pipeline/rpc/peer.go rename to pipeline/rpc/peer.go index 8402a8319..874a8f504 100644 --- a/cncd/pipeline/pipeline/rpc/peer.go +++ b/pipeline/rpc/peer.go @@ -3,7 +3,7 @@ package rpc import ( "context" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend" + "github.com/woodpecker-ci/woodpecker/pipeline/backend" ) // ErrCancelled signals the pipeine is cancelled. diff --git a/cncd/pipeline/pipeline/rpc/proto/drone.pb.go b/pipeline/rpc/proto/drone.pb.go similarity index 100% rename from cncd/pipeline/pipeline/rpc/proto/drone.pb.go rename to pipeline/rpc/proto/drone.pb.go diff --git a/cncd/pipeline/pipeline/rpc/proto/drone.proto b/pipeline/rpc/proto/drone.proto similarity index 100% rename from cncd/pipeline/pipeline/rpc/proto/drone.proto rename to pipeline/rpc/proto/drone.proto diff --git a/cncd/pipeline/samples/sample_1/.env b/pipeline/samples/sample_1/.env similarity index 100% rename from cncd/pipeline/samples/sample_1/.env rename to pipeline/samples/sample_1/.env diff --git a/cncd/pipeline/samples/sample_1/README.md b/pipeline/samples/sample_1/README.md similarity index 100% rename from cncd/pipeline/samples/sample_1/README.md rename to pipeline/samples/sample_1/README.md diff --git a/cncd/pipeline/samples/sample_1/pipeline.json b/pipeline/samples/sample_1/pipeline.json similarity index 100% rename from cncd/pipeline/samples/sample_1/pipeline.json rename to pipeline/samples/sample_1/pipeline.json diff --git a/cncd/pipeline/samples/sample_1/pipeline.yml b/pipeline/samples/sample_1/pipeline.yml similarity index 100% rename from cncd/pipeline/samples/sample_1/pipeline.yml rename to pipeline/samples/sample_1/pipeline.yml diff --git a/cncd/pipeline/samples/sample_10_windows/.env b/pipeline/samples/sample_10_windows/.env similarity index 100% rename from cncd/pipeline/samples/sample_10_windows/.env rename to pipeline/samples/sample_10_windows/.env diff --git a/cncd/pipeline/samples/sample_10_windows/README.md b/pipeline/samples/sample_10_windows/README.md similarity index 100% rename from cncd/pipeline/samples/sample_10_windows/README.md rename to pipeline/samples/sample_10_windows/README.md diff --git a/cncd/pipeline/samples/sample_10_windows/pipeline.json b/pipeline/samples/sample_10_windows/pipeline.json similarity index 100% rename from cncd/pipeline/samples/sample_10_windows/pipeline.json rename to pipeline/samples/sample_10_windows/pipeline.json diff --git a/cncd/pipeline/samples/sample_10_windows/pipeline.yml b/pipeline/samples/sample_10_windows/pipeline.yml similarity index 100% rename from cncd/pipeline/samples/sample_10_windows/pipeline.yml rename to pipeline/samples/sample_10_windows/pipeline.yml diff --git a/cncd/pipeline/samples/sample_2/.env b/pipeline/samples/sample_2/.env similarity index 100% rename from cncd/pipeline/samples/sample_2/.env rename to pipeline/samples/sample_2/.env diff --git a/cncd/pipeline/samples/sample_2/pipeline.json b/pipeline/samples/sample_2/pipeline.json similarity index 100% rename from cncd/pipeline/samples/sample_2/pipeline.json rename to pipeline/samples/sample_2/pipeline.json diff --git a/cncd/pipeline/samples/sample_2/pipeline.yml b/pipeline/samples/sample_2/pipeline.yml similarity index 100% rename from cncd/pipeline/samples/sample_2/pipeline.yml rename to pipeline/samples/sample_2/pipeline.yml diff --git a/cncd/pipeline/samples/sample_3/.env b/pipeline/samples/sample_3/.env similarity index 100% rename from cncd/pipeline/samples/sample_3/.env rename to pipeline/samples/sample_3/.env diff --git a/cncd/pipeline/samples/sample_3/pipeline.json b/pipeline/samples/sample_3/pipeline.json similarity index 100% rename from cncd/pipeline/samples/sample_3/pipeline.json rename to pipeline/samples/sample_3/pipeline.json diff --git a/cncd/pipeline/samples/sample_3/pipeline.yml b/pipeline/samples/sample_3/pipeline.yml similarity index 100% rename from cncd/pipeline/samples/sample_3/pipeline.yml rename to pipeline/samples/sample_3/pipeline.yml diff --git a/cncd/pipeline/samples/sample_4/.env b/pipeline/samples/sample_4/.env similarity index 100% rename from cncd/pipeline/samples/sample_4/.env rename to pipeline/samples/sample_4/.env diff --git a/cncd/pipeline/samples/sample_4/pipeline.json b/pipeline/samples/sample_4/pipeline.json similarity index 100% rename from cncd/pipeline/samples/sample_4/pipeline.json rename to pipeline/samples/sample_4/pipeline.json diff --git a/cncd/pipeline/samples/sample_4/pipeline.yml b/pipeline/samples/sample_4/pipeline.yml similarity index 100% rename from cncd/pipeline/samples/sample_4/pipeline.yml rename to pipeline/samples/sample_4/pipeline.yml diff --git a/cncd/pipeline/samples/sample_5/.env b/pipeline/samples/sample_5/.env similarity index 100% rename from cncd/pipeline/samples/sample_5/.env rename to pipeline/samples/sample_5/.env diff --git a/cncd/pipeline/samples/sample_5/pipeline.json b/pipeline/samples/sample_5/pipeline.json similarity index 100% rename from cncd/pipeline/samples/sample_5/pipeline.json rename to pipeline/samples/sample_5/pipeline.json diff --git a/cncd/pipeline/samples/sample_5/pipeline.yml b/pipeline/samples/sample_5/pipeline.yml similarity index 100% rename from cncd/pipeline/samples/sample_5/pipeline.yml rename to pipeline/samples/sample_5/pipeline.yml diff --git a/cncd/pipeline/samples/sample_6/.env b/pipeline/samples/sample_6/.env similarity index 100% rename from cncd/pipeline/samples/sample_6/.env rename to pipeline/samples/sample_6/.env diff --git a/cncd/pipeline/samples/sample_6/pipeline.json b/pipeline/samples/sample_6/pipeline.json similarity index 100% rename from cncd/pipeline/samples/sample_6/pipeline.json rename to pipeline/samples/sample_6/pipeline.json diff --git a/cncd/pipeline/samples/sample_6/pipeline.yml b/pipeline/samples/sample_6/pipeline.yml similarity index 100% rename from cncd/pipeline/samples/sample_6/pipeline.yml rename to pipeline/samples/sample_6/pipeline.yml diff --git a/cncd/pipeline/samples/sample_7_redis/pipeline.json b/pipeline/samples/sample_7_redis/pipeline.json similarity index 100% rename from cncd/pipeline/samples/sample_7_redis/pipeline.json rename to pipeline/samples/sample_7_redis/pipeline.json diff --git a/cncd/pipeline/samples/sample_7_redis/pipeline.yml b/pipeline/samples/sample_7_redis/pipeline.yml similarity index 100% rename from cncd/pipeline/samples/sample_7_redis/pipeline.yml rename to pipeline/samples/sample_7_redis/pipeline.yml diff --git a/cncd/pipeline/samples/sample_8_network_mode/README.md b/pipeline/samples/sample_8_network_mode/README.md similarity index 100% rename from cncd/pipeline/samples/sample_8_network_mode/README.md rename to pipeline/samples/sample_8_network_mode/README.md diff --git a/cncd/pipeline/samples/sample_8_network_mode/pipeline.json b/pipeline/samples/sample_8_network_mode/pipeline.json similarity index 100% rename from cncd/pipeline/samples/sample_8_network_mode/pipeline.json rename to pipeline/samples/sample_8_network_mode/pipeline.json diff --git a/cncd/pipeline/samples/sample_8_network_mode/pipeline.yml b/pipeline/samples/sample_8_network_mode/pipeline.yml similarity index 100% rename from cncd/pipeline/samples/sample_8_network_mode/pipeline.yml rename to pipeline/samples/sample_8_network_mode/pipeline.yml diff --git a/cncd/pipeline/samples/sample_8_postgres/pipeline.yml b/pipeline/samples/sample_8_postgres/pipeline.yml similarity index 100% rename from cncd/pipeline/samples/sample_8_postgres/pipeline.yml rename to pipeline/samples/sample_8_postgres/pipeline.yml diff --git a/cncd/pipeline/samples/sample_9_cache/.env b/pipeline/samples/sample_9_cache/.env similarity index 100% rename from cncd/pipeline/samples/sample_9_cache/.env rename to pipeline/samples/sample_9_cache/.env diff --git a/cncd/pipeline/samples/sample_9_cache/pipeline.json b/pipeline/samples/sample_9_cache/pipeline.json similarity index 100% rename from cncd/pipeline/samples/sample_9_cache/pipeline.json rename to pipeline/samples/sample_9_cache/pipeline.json diff --git a/cncd/pipeline/samples/sample_9_cache/pipeline.yml b/pipeline/samples/sample_9_cache/pipeline.yml similarity index 100% rename from cncd/pipeline/samples/sample_9_cache/pipeline.yml rename to pipeline/samples/sample_9_cache/pipeline.yml diff --git a/cncd/pipeline/pipeline/tracer.go b/pipeline/tracer.go similarity index 100% rename from cncd/pipeline/pipeline/tracer.go rename to pipeline/tracer.go diff --git a/cncd/pipeline/version/version.go b/pipeline/version/version.go similarity index 100% rename from cncd/pipeline/version/version.go rename to pipeline/version/version.go diff --git a/server/api/hook.go b/server/api/hook.go index 959fc810b..82ee65d21 100644 --- a/server/api/hook.go +++ b/server/api/hook.go @@ -34,8 +34,8 @@ import ( "github.com/woodpecker-ci/woodpecker/model" "github.com/woodpecker-ci/woodpecker/shared/token" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/rpc" + "github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml" + "github.com/woodpecker-ci/woodpecker/pipeline/rpc" "github.com/woodpecker-ci/woodpecker/server" "github.com/woodpecker-ci/woodpecker/server/pubsub" "github.com/woodpecker-ci/woodpecker/server/queue" diff --git a/server/grpc/rpc.go b/server/grpc/rpc.go index b2b2d752f..277035672 100644 --- a/server/grpc/rpc.go +++ b/server/grpc/rpc.go @@ -32,8 +32,8 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" "github.com/sirupsen/logrus" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/rpc" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/rpc/proto" + "github.com/woodpecker-ci/woodpecker/pipeline/rpc" + "github.com/woodpecker-ci/woodpecker/pipeline/rpc/proto" "github.com/woodpecker-ci/woodpecker/server" "github.com/woodpecker-ci/woodpecker/server/logging" "github.com/woodpecker-ci/woodpecker/server/pubsub" diff --git a/server/shared/procBuilder.go b/server/shared/procBuilder.go index 2d2127266..b71077919 100644 --- a/server/shared/procBuilder.go +++ b/server/shared/procBuilder.go @@ -23,13 +23,13 @@ import ( "strings" "github.com/drone/envsubst" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml/compiler" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml/linter" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml/matrix" "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/pipeline/backend" + "github.com/woodpecker-ci/woodpecker/pipeline/frontend" + "github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml" + "github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml/compiler" + "github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml/linter" + "github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml/matrix" "github.com/woodpecker-ci/woodpecker/server" "github.com/woodpecker-ci/woodpecker/server/remote" ) diff --git a/server/shared/procStatus.go b/server/shared/procStatus.go index 856857689..f9a0703c4 100644 --- a/server/shared/procStatus.go +++ b/server/shared/procStatus.go @@ -17,8 +17,8 @@ package shared import ( "time" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/rpc" "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/pipeline/rpc" ) type UpdateProcStore interface { diff --git a/server/shared/procStatus_test.go b/server/shared/procStatus_test.go index 55584d8f5..f4c139876 100644 --- a/server/shared/procStatus_test.go +++ b/server/shared/procStatus_test.go @@ -18,8 +18,8 @@ import ( "testing" "time" - "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/rpc" "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/pipeline/rpc" ) type mockUpdateProcStore struct {