diff --git a/.gitpod.yml b/.gitpod.yml index 245eaac7b..ab94af26c 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -24,7 +24,7 @@ tasks: || echo WOODPECKER_DEV_OAUTH_HOST=$(gp url 8000) >> .env gp sync-await gitea gp sync-done woodpecker-server - go run go.woodpecker-ci.org/woodpecker/cmd/server + go run go.woodpecker-ci.org/woodpecker/v2/cmd/server - name: Agent env: WOODPECKER_SERVER: localhost:9000 @@ -33,7 +33,7 @@ tasks: WOODPECKER_HEALTHCHECK: false command: | gp sync-await woodpecker-server - go run go.woodpecker-ci.org/woodpecker/cmd/agent + go run go.woodpecker-ci.org/woodpecker/v2/cmd/agent - name: Gitea command: | export DOCKER_COMPOSE_CMD="docker-compose -f docker-compose.gitpod.yml -p woodpecker" diff --git a/.woodpecker/test.yml b/.woodpecker/test.yml index e309b08fb..c6c75c390 100644 --- a/.woodpecker/test.yml +++ b/.woodpecker/test.yml @@ -33,7 +33,7 @@ steps: lint-pipeline: image: *golang_image commands: - - go run go.woodpecker-ci.org/woodpecker/cmd/cli lint + - go run go.woodpecker-ci.org/woodpecker/v2/cmd/cli lint when: - <<: *when - path: diff --git a/Makefile b/Makefile index 6d5964e26..49971e746 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ else endif endif -LDFLAGS := -s -w -extldflags "-static" -X go.woodpecker-ci.org/woodpecker/version.Version=${VERSION} +LDFLAGS := -s -w -extldflags "-static" -X go.woodpecker-ci.org/woodpecker/v2/version.Version=${VERSION} CGO_ENABLED ?= 1 # only used to compile server HAS_GO = $(shell hash go > /dev/null 2>&1 && echo "GO" || echo "NOGO" ) @@ -144,20 +144,20 @@ lint-ui: ## Lint UI code (cd web/; pnpm lint --quiet) test-agent: ## Test agent code - go test -race -cover -coverprofile agent-coverage.out -timeout 30s go.woodpecker-ci.org/woodpecker/cmd/agent go.woodpecker-ci.org/woodpecker/agent/... + go test -race -cover -coverprofile agent-coverage.out -timeout 30s go.woodpecker-ci.org/woodpecker/v2/cmd/agent go.woodpecker-ci.org/woodpecker/v2/agent/... test-server: ## Test server code - go test -race -cover -coverprofile server-coverage.out -timeout 30s go.woodpecker-ci.org/woodpecker/cmd/server $(shell go list go.woodpecker-ci.org/woodpecker/server/... | grep -v '/store') + go test -race -cover -coverprofile server-coverage.out -timeout 30s go.woodpecker-ci.org/woodpecker/v2/cmd/server $(shell go list go.woodpecker-ci.org/woodpecker/v2/server/... | grep -v '/store') test-cli: ## Test cli code - go test -race -cover -coverprofile cli-coverage.out -timeout 30s go.woodpecker-ci.org/woodpecker/cmd/cli go.woodpecker-ci.org/woodpecker/cli/... + go test -race -cover -coverprofile cli-coverage.out -timeout 30s go.woodpecker-ci.org/woodpecker/v2/cmd/cli go.woodpecker-ci.org/woodpecker/v2/cli/... test-server-datastore: ## Test server datastore - go test -timeout 120s -run TestMigrate go.woodpecker-ci.org/woodpecker/server/store/... - go test -race -timeout 30s -skip TestMigrate go.woodpecker-ci.org/woodpecker/server/store/... + go test -timeout 120s -run TestMigrate go.woodpecker-ci.org/woodpecker/v2/server/store/... + go test -race -timeout 30s -skip TestMigrate go.woodpecker-ci.org/woodpecker/v2/server/store/... test-server-datastore-coverage: ## Test server datastore with coverage report - go test -race -cover -coverprofile datastore-coverage.out -timeout 120s go.woodpecker-ci.org/woodpecker/server/store/... + go test -race -cover -coverprofile datastore-coverage.out -timeout 120s go.woodpecker-ci.org/woodpecker/v2/server/store/... test-ui: ui-dependencies ## Test UI code (cd web/; pnpm run lint) @@ -177,13 +177,13 @@ build-ui: ## Build UI (cd web/; pnpm install --frozen-lockfile; pnpm build) build-server: build-ui generate-swagger ## Build server - CGO_ENABLED=${CGO_ENABLED} GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -ldflags '${LDFLAGS}' -o dist/woodpecker-server${BIN_SUFFIX} go.woodpecker-ci.org/woodpecker/cmd/server + CGO_ENABLED=${CGO_ENABLED} GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -ldflags '${LDFLAGS}' -o dist/woodpecker-server${BIN_SUFFIX} go.woodpecker-ci.org/woodpecker/v2/cmd/server build-agent: ## Build agent - CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -ldflags '${LDFLAGS}' -o dist/woodpecker-agent${BIN_SUFFIX} go.woodpecker-ci.org/woodpecker/cmd/agent + CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -ldflags '${LDFLAGS}' -o dist/woodpecker-agent${BIN_SUFFIX} go.woodpecker-ci.org/woodpecker/v2/cmd/agent build-cli: ## Build cli - CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -ldflags '${LDFLAGS}' -o dist/woodpecker-cli${BIN_SUFFIX} go.woodpecker-ci.org/woodpecker/cmd/cli + CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -ldflags '${LDFLAGS}' -o dist/woodpecker-cli${BIN_SUFFIX} go.woodpecker-ci.org/woodpecker/v2/cmd/cli .PHONY: build build: build-agent build-server build-cli ## Build all binaries @@ -213,18 +213,18 @@ release-server-xgo: check-xgo ## Create server binaries for release using xgo release-server: ## Create server binaries for release # compile - GOOS=$(TARGETOS) GOARCH=$(TARGETARCH) CGO_ENABLED=${CGO_ENABLED} go build -ldflags '${LDFLAGS}' -o dist/server/$(TARGETOS)_$(TARGETARCH)/woodpecker-server$(BIN_SUFFIX) go.woodpecker-ci.org/woodpecker/cmd/server + GOOS=$(TARGETOS) GOARCH=$(TARGETARCH) CGO_ENABLED=${CGO_ENABLED} go build -ldflags '${LDFLAGS}' -o dist/server/$(TARGETOS)_$(TARGETARCH)/woodpecker-server$(BIN_SUFFIX) go.woodpecker-ci.org/woodpecker/v2/cmd/server # tar binary files tar -cvzf dist/woodpecker-server_$(TARGETOS)_$(TARGETARCH).tar.gz -C dist/server/$(TARGETOS)_$(TARGETARCH) woodpecker-server$(BIN_SUFFIX) release-agent: ## Create agent binaries for release # compile - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o dist/agent/linux_amd64/woodpecker-agent go.woodpecker-ci.org/woodpecker/cmd/agent - GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o dist/agent/linux_arm64/woodpecker-agent go.woodpecker-ci.org/woodpecker/cmd/agent - GOOS=linux GOARCH=arm CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o dist/agent/linux_arm/woodpecker-agent go.woodpecker-ci.org/woodpecker/cmd/agent - GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o dist/agent/windows_amd64/woodpecker-agent.exe go.woodpecker-ci.org/woodpecker/cmd/agent - GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o dist/agent/darwin_amd64/woodpecker-agent go.woodpecker-ci.org/woodpecker/cmd/agent - GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o dist/agent/darwin_arm64/woodpecker-agent go.woodpecker-ci.org/woodpecker/cmd/agent + GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o dist/agent/linux_amd64/woodpecker-agent go.woodpecker-ci.org/woodpecker/v2/cmd/agent + GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o dist/agent/linux_arm64/woodpecker-agent go.woodpecker-ci.org/woodpecker/v2/cmd/agent + GOOS=linux GOARCH=arm CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o dist/agent/linux_arm/woodpecker-agent go.woodpecker-ci.org/woodpecker/v2/cmd/agent + GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o dist/agent/windows_amd64/woodpecker-agent.exe go.woodpecker-ci.org/woodpecker/v2/cmd/agent + GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o dist/agent/darwin_amd64/woodpecker-agent go.woodpecker-ci.org/woodpecker/v2/cmd/agent + GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o dist/agent/darwin_arm64/woodpecker-agent go.woodpecker-ci.org/woodpecker/v2/cmd/agent # tar binary files tar -cvzf dist/woodpecker-agent_linux_amd64.tar.gz -C dist/agent/linux_amd64 woodpecker-agent tar -cvzf dist/woodpecker-agent_linux_arm64.tar.gz -C dist/agent/linux_arm64 woodpecker-agent @@ -235,12 +235,12 @@ release-agent: ## Create agent binaries for release release-cli: ## Create cli binaries for release # compile - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o dist/cli/linux_amd64/woodpecker-cli go.woodpecker-ci.org/woodpecker/cmd/cli - GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o dist/cli/linux_arm64/woodpecker-cli go.woodpecker-ci.org/woodpecker/cmd/cli - GOOS=linux GOARCH=arm CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o dist/cli/linux_arm/woodpecker-cli go.woodpecker-ci.org/woodpecker/cmd/cli - GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o dist/cli/windows_amd64/woodpecker-cli.exe go.woodpecker-ci.org/woodpecker/cmd/cli - GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o dist/cli/darwin_amd64/woodpecker-cli go.woodpecker-ci.org/woodpecker/cmd/cli - GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o dist/cli/darwin_arm64/woodpecker-cli go.woodpecker-ci.org/woodpecker/cmd/cli + GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o dist/cli/linux_amd64/woodpecker-cli go.woodpecker-ci.org/woodpecker/v2/cmd/cli + GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o dist/cli/linux_arm64/woodpecker-cli go.woodpecker-ci.org/woodpecker/v2/cmd/cli + GOOS=linux GOARCH=arm CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o dist/cli/linux_arm/woodpecker-cli go.woodpecker-ci.org/woodpecker/v2/cmd/cli + GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o dist/cli/windows_amd64/woodpecker-cli.exe go.woodpecker-ci.org/woodpecker/v2/cmd/cli + GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o dist/cli/darwin_amd64/woodpecker-cli go.woodpecker-ci.org/woodpecker/v2/cmd/cli + GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o dist/cli/darwin_arm64/woodpecker-cli go.woodpecker-ci.org/woodpecker/v2/cmd/cli # tar binary files tar -cvzf dist/woodpecker-cli_linux_amd64.tar.gz -C dist/cli/linux_amd64 woodpecker-cli tar -cvzf dist/woodpecker-cli_linux_arm64.tar.gz -C dist/cli/linux_arm64 woodpecker-cli diff --git a/agent/logger.go b/agent/logger.go index cc41b30e6..9d1c92ecc 100644 --- a/agent/logger.go +++ b/agent/logger.go @@ -21,10 +21,10 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/pipeline" - backend "go.woodpecker-ci.org/woodpecker/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/pipeline/multipart" - "go.woodpecker-ci.org/woodpecker/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v2/pipeline" + backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/multipart" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" ) func (r *Runner) createLogger(logger zerolog.Logger, uploads *sync.WaitGroup, workflow *rpc.Workflow) pipeline.LogFunc { diff --git a/agent/rpc/auth_client_grpc.go b/agent/rpc/auth_client_grpc.go index 3bc321ba8..5f31e2803 100644 --- a/agent/rpc/auth_client_grpc.go +++ b/agent/rpc/auth_client_grpc.go @@ -18,7 +18,7 @@ import ( "context" "time" - "go.woodpecker-ci.org/woodpecker/pipeline/rpc/proto" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc/proto" "google.golang.org/grpc" ) diff --git a/agent/rpc/client_grpc.go b/agent/rpc/client_grpc.go index dc3fae921..531c5c7ad 100644 --- a/agent/rpc/client_grpc.go +++ b/agent/rpc/client_grpc.go @@ -26,9 +26,9 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - backend "go.woodpecker-ci.org/woodpecker/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/pipeline/rpc/proto" + backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc/proto" ) // set grpc version on compile time to compare against server version response diff --git a/agent/runner.go b/agent/runner.go index b6f5953f8..991751fcc 100644 --- a/agent/runner.go +++ b/agent/runner.go @@ -26,10 +26,10 @@ import ( "github.com/tevino/abool/v2" "google.golang.org/grpc/metadata" - "go.woodpecker-ci.org/woodpecker/pipeline" - backend "go.woodpecker-ci.org/woodpecker/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/shared/utils" + "go.woodpecker-ci.org/woodpecker/v2/pipeline" + backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v2/shared/utils" ) type Runner struct { diff --git a/agent/tracer.go b/agent/tracer.go index 5cf60ca60..36d210b72 100644 --- a/agent/tracer.go +++ b/agent/tracer.go @@ -22,8 +22,8 @@ import ( "github.com/rs/zerolog" - "go.woodpecker-ci.org/woodpecker/pipeline" - "go.woodpecker-ci.org/woodpecker/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v2/pipeline" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" ) func (r *Runner) createTracer(ctxmeta context.Context, logger zerolog.Logger, workflow *rpc.Workflow) pipeline.TraceFunc { diff --git a/cli/common/flags.go b/cli/common/flags.go index 16045c92c..08f228866 100644 --- a/cli/common/flags.go +++ b/cli/common/flags.go @@ -17,7 +17,7 @@ package common import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cmd/common" + "go.woodpecker-ci.org/woodpecker/v2/cmd/common" ) var GlobalFlags = append([]cli.Flag{ diff --git a/cli/common/pipeline.go b/cli/common/pipeline.go index bbe89d9a4..b479e5693 100644 --- a/cli/common/pipeline.go +++ b/cli/common/pipeline.go @@ -21,7 +21,7 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/shared/constant" + "go.woodpecker-ci.org/woodpecker/v2/shared/constant" ) func DetectPipelineConfig() (isDir bool, config string, _ error) { diff --git a/cli/common/zerologger.go b/cli/common/zerologger.go index 597478f7b..c6163695a 100644 --- a/cli/common/zerologger.go +++ b/cli/common/zerologger.go @@ -17,7 +17,7 @@ package common import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cmd/common" + "go.woodpecker-ci.org/woodpecker/v2/cmd/common" ) func SetupGlobalLogger(c *cli.Context) error { diff --git a/cli/cron/cron.go b/cli/cron/cron.go index e9e7f8fbf..580b9fe21 100644 --- a/cli/cron/cron.go +++ b/cli/cron/cron.go @@ -17,7 +17,7 @@ package cron import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" ) // Command exports the cron command set. diff --git a/cli/cron/cron_add.go b/cli/cron/cron_add.go index 705798991..f26aa7bbb 100644 --- a/cli/cron/cron_add.go +++ b/cli/cron/cron_add.go @@ -20,9 +20,9 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" - "go.woodpecker-ci.org/woodpecker/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" ) var cronCreateCmd = &cli.Command{ diff --git a/cli/cron/cron_info.go b/cli/cron/cron_info.go index 20825bfe0..126a03675 100644 --- a/cli/cron/cron_info.go +++ b/cli/cron/cron_info.go @@ -20,8 +20,8 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" ) var cronInfoCmd = &cli.Command{ diff --git a/cli/cron/cron_list.go b/cli/cron/cron_list.go index 694c92920..33161d8ee 100644 --- a/cli/cron/cron_list.go +++ b/cli/cron/cron_list.go @@ -20,8 +20,8 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" ) var cronListCmd = &cli.Command{ diff --git a/cli/cron/cron_rm.go b/cli/cron/cron_rm.go index 642840ff2..1428651e0 100644 --- a/cli/cron/cron_rm.go +++ b/cli/cron/cron_rm.go @@ -19,8 +19,8 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" ) var cronDeleteCmd = &cli.Command{ diff --git a/cli/cron/cron_update.go b/cli/cron/cron_update.go index b2a84a5e3..94188e9fa 100644 --- a/cli/cron/cron_update.go +++ b/cli/cron/cron_update.go @@ -20,9 +20,9 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" - "go.woodpecker-ci.org/woodpecker/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" ) var cronUpdateCmd = &cli.Command{ diff --git a/cli/deploy/deploy.go b/cli/deploy/deploy.go index 931494cab..5d5bf80b6 100644 --- a/cli/deploy/deploy.go +++ b/cli/deploy/deploy.go @@ -22,9 +22,9 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" - "go.woodpecker-ci.org/woodpecker/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" ) // Command exports the deploy command. diff --git a/cli/exec/exec.go b/cli/exec/exec.go index a9133714c..d125ae936 100644 --- a/cli/exec/exec.go +++ b/cli/exec/exec.go @@ -27,19 +27,19 @@ import ( "github.com/drone/envsubst" "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/pipeline" - "go.woodpecker-ci.org/woodpecker/pipeline/backend" - "go.woodpecker-ci.org/woodpecker/pipeline/backend/docker" - "go.woodpecker-ci.org/woodpecker/pipeline/backend/kubernetes" - "go.woodpecker-ci.org/woodpecker/pipeline/backend/local" - backendTypes "go.woodpecker-ci.org/woodpecker/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml/compiler" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml/linter" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml/matrix" - "go.woodpecker-ci.org/woodpecker/pipeline/multipart" - "go.woodpecker-ci.org/woodpecker/shared/utils" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/pipeline" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/docker" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/kubernetes" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/local" + backendTypes "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/compiler" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/linter" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/matrix" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/multipart" + "go.woodpecker-ci.org/woodpecker/v2/shared/utils" ) // Command exports the exec command. diff --git a/cli/exec/flags.go b/cli/exec/flags.go index 23caa54e5..be2bb69a2 100644 --- a/cli/exec/flags.go +++ b/cli/exec/flags.go @@ -19,7 +19,7 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/shared/constant" + "go.woodpecker-ci.org/woodpecker/v2/shared/constant" ) var flags = []cli.Flag{ diff --git a/cli/exec/line.go b/cli/exec/line.go index d4e22a719..119720981 100644 --- a/cli/exec/line.go +++ b/cli/exec/line.go @@ -20,7 +20,7 @@ import ( "strings" "time" - "go.woodpecker-ci.org/woodpecker/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" ) // LineWriter sends logs to the client. diff --git a/cli/exec/metadata.go b/cli/exec/metadata.go index 9d7f2ca91..c72aeaffa 100644 --- a/cli/exec/metadata.go +++ b/cli/exec/metadata.go @@ -20,9 +20,9 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/metadata" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml/matrix" - "go.woodpecker-ci.org/woodpecker/version" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/matrix" + "go.woodpecker-ci.org/woodpecker/v2/version" ) // return the metadata from the cli context. diff --git a/cli/info/info.go b/cli/info/info.go index 84d7ee99e..ce5a4fcb7 100644 --- a/cli/info/info.go +++ b/cli/info/info.go @@ -20,8 +20,8 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" ) // Command exports the info command. diff --git a/cli/internal/util.go b/cli/internal/util.go index 93017e979..e71b7558d 100644 --- a/cli/internal/util.go +++ b/cli/internal/util.go @@ -27,7 +27,7 @@ import ( "golang.org/x/net/proxy" "golang.org/x/oauth2" - "go.woodpecker-ci.org/woodpecker/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" ) // NewClient returns a new client from the CLI context. diff --git a/cli/lint/lint.go b/cli/lint/lint.go index 8902e9b87..81ff0ba65 100644 --- a/cli/lint/lint.go +++ b/cli/lint/lint.go @@ -25,10 +25,10 @@ import ( "github.com/muesli/termenv" "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - pipeline_errors "go.woodpecker-ci.org/woodpecker/pipeline/errors" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml/linter" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + pipeline_errors "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/linter" ) // Command exports the info command. diff --git a/cli/log/log.go b/cli/log/log.go index 03957cc8b..9c402b8f4 100644 --- a/cli/log/log.go +++ b/cli/log/log.go @@ -17,7 +17,7 @@ package log import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" ) // Command exports the log command set. diff --git a/cli/log/log_purge.go b/cli/log/log_purge.go index c7d3b63c7..e95ff093a 100644 --- a/cli/log/log_purge.go +++ b/cli/log/log_purge.go @@ -20,8 +20,8 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" ) var logPurgeCmd = &cli.Command{ diff --git a/cli/loglevel/loglevel.go b/cli/loglevel/loglevel.go index 02d097ccf..79d6e1f6d 100644 --- a/cli/loglevel/loglevel.go +++ b/cli/loglevel/loglevel.go @@ -19,9 +19,9 @@ import ( "github.com/rs/zerolog/log" "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" - "go.woodpecker-ci.org/woodpecker/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" ) // Command exports the log-level command used to change the servers log-level. diff --git a/cli/pipeline/approve.go b/cli/pipeline/approve.go index cfaff79c8..1fcb701e2 100644 --- a/cli/pipeline/approve.go +++ b/cli/pipeline/approve.go @@ -20,8 +20,8 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" ) var pipelineApproveCmd = &cli.Command{ diff --git a/cli/pipeline/create.go b/cli/pipeline/create.go index 806e307d2..5707abcde 100644 --- a/cli/pipeline/create.go +++ b/cli/pipeline/create.go @@ -19,12 +19,12 @@ import ( "strings" "text/template" - "go.woodpecker-ci.org/woodpecker/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" ) var pipelineCreateCmd = &cli.Command{ diff --git a/cli/pipeline/decline.go b/cli/pipeline/decline.go index 34df89fbd..c730d2f4f 100644 --- a/cli/pipeline/decline.go +++ b/cli/pipeline/decline.go @@ -20,8 +20,8 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" ) var pipelineDeclineCmd = &cli.Command{ diff --git a/cli/pipeline/info.go b/cli/pipeline/info.go index 20e85b483..7e0fae28e 100644 --- a/cli/pipeline/info.go +++ b/cli/pipeline/info.go @@ -21,8 +21,8 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" ) var pipelineInfoCmd = &cli.Command{ diff --git a/cli/pipeline/kill.go b/cli/pipeline/kill.go index 55b84c5f0..3648c11ec 100644 --- a/cli/pipeline/kill.go +++ b/cli/pipeline/kill.go @@ -20,8 +20,8 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" ) var pipelineKillCmd = &cli.Command{ diff --git a/cli/pipeline/last.go b/cli/pipeline/last.go index 18342b234..7e61544c2 100644 --- a/cli/pipeline/last.go +++ b/cli/pipeline/last.go @@ -20,8 +20,8 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" ) var pipelineLastCmd = &cli.Command{ diff --git a/cli/pipeline/list.go b/cli/pipeline/list.go index 8e455b473..1e685164f 100644 --- a/cli/pipeline/list.go +++ b/cli/pipeline/list.go @@ -20,8 +20,8 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" ) var pipelineListCmd = &cli.Command{ diff --git a/cli/pipeline/logs.go b/cli/pipeline/logs.go index 64fd35e24..8001eadfe 100644 --- a/cli/pipeline/logs.go +++ b/cli/pipeline/logs.go @@ -18,8 +18,8 @@ import ( "fmt" "strconv" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" "github.com/urfave/cli/v2" ) diff --git a/cli/pipeline/pipeline.go b/cli/pipeline/pipeline.go index b6db33beb..64c91f7be 100644 --- a/cli/pipeline/pipeline.go +++ b/cli/pipeline/pipeline.go @@ -17,7 +17,7 @@ package pipeline import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" ) // Command exports the pipeline command set. diff --git a/cli/pipeline/ps.go b/cli/pipeline/ps.go index 7aedada47..940facb4d 100644 --- a/cli/pipeline/ps.go +++ b/cli/pipeline/ps.go @@ -21,8 +21,8 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" ) var pipelinePsCmd = &cli.Command{ diff --git a/cli/pipeline/queue.go b/cli/pipeline/queue.go index b8d9577c4..08e7b22ce 100644 --- a/cli/pipeline/queue.go +++ b/cli/pipeline/queue.go @@ -21,8 +21,8 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" ) var pipelineQueueCmd = &cli.Command{ diff --git a/cli/pipeline/start.go b/cli/pipeline/start.go index 71d1f7a9a..a6e9f98a9 100644 --- a/cli/pipeline/start.go +++ b/cli/pipeline/start.go @@ -21,8 +21,8 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" ) var pipelineStartCmd = &cli.Command{ diff --git a/cli/pipeline/stop.go b/cli/pipeline/stop.go index 1f6301fd4..121b751b5 100644 --- a/cli/pipeline/stop.go +++ b/cli/pipeline/stop.go @@ -20,8 +20,8 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" ) var pipelineStopCmd = &cli.Command{ diff --git a/cli/registry/registry.go b/cli/registry/registry.go index 6c2cd13b7..da973aa6c 100644 --- a/cli/registry/registry.go +++ b/cli/registry/registry.go @@ -17,7 +17,7 @@ package registry import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" ) // Command exports the registry command set. diff --git a/cli/registry/registry_add.go b/cli/registry/registry_add.go index d06ba1ff7..795b2da9a 100644 --- a/cli/registry/registry_add.go +++ b/cli/registry/registry_add.go @@ -20,9 +20,9 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" - "go.woodpecker-ci.org/woodpecker/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" ) var registryCreateCmd = &cli.Command{ diff --git a/cli/registry/registry_info.go b/cli/registry/registry_info.go index 9cb041ad8..add3e0697 100644 --- a/cli/registry/registry_info.go +++ b/cli/registry/registry_info.go @@ -20,8 +20,8 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" ) var registryInfoCmd = &cli.Command{ diff --git a/cli/registry/registry_list.go b/cli/registry/registry_list.go index 3d43dfcd6..2c7f5afe9 100644 --- a/cli/registry/registry_list.go +++ b/cli/registry/registry_list.go @@ -20,8 +20,8 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" ) var registryListCmd = &cli.Command{ diff --git a/cli/registry/registry_rm.go b/cli/registry/registry_rm.go index 19c87b46b..5bc1c1600 100644 --- a/cli/registry/registry_rm.go +++ b/cli/registry/registry_rm.go @@ -17,8 +17,8 @@ package registry import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" ) var registryDeleteCmd = &cli.Command{ diff --git a/cli/registry/registry_set.go b/cli/registry/registry_set.go index 1ed2fc36d..b7c143cd9 100644 --- a/cli/registry/registry_set.go +++ b/cli/registry/registry_set.go @@ -20,9 +20,9 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" - "go.woodpecker-ci.org/woodpecker/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" ) var registryUpdateCmd = &cli.Command{ diff --git a/cli/repo/repo.go b/cli/repo/repo.go index ceba0bb3d..ae760b944 100644 --- a/cli/repo/repo.go +++ b/cli/repo/repo.go @@ -17,7 +17,7 @@ package repo import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" ) // Command exports the repository command. diff --git a/cli/repo/repo_add.go b/cli/repo/repo_add.go index accf280d9..fac4d3a95 100644 --- a/cli/repo/repo_add.go +++ b/cli/repo/repo_add.go @@ -20,8 +20,8 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" ) var repoAddCmd = &cli.Command{ diff --git a/cli/repo/repo_chown.go b/cli/repo/repo_chown.go index 983f7c817..dadc05077 100644 --- a/cli/repo/repo_chown.go +++ b/cli/repo/repo_chown.go @@ -19,8 +19,8 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" ) var repoChownCmd = &cli.Command{ diff --git a/cli/repo/repo_info.go b/cli/repo/repo_info.go index f3c0fc73e..69ae2bfdc 100644 --- a/cli/repo/repo_info.go +++ b/cli/repo/repo_info.go @@ -20,8 +20,8 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" ) var repoInfoCmd = &cli.Command{ diff --git a/cli/repo/repo_list.go b/cli/repo/repo_list.go index 96e85f95a..747ce8fe5 100644 --- a/cli/repo/repo_list.go +++ b/cli/repo/repo_list.go @@ -20,8 +20,8 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" ) var repoListCmd = &cli.Command{ diff --git a/cli/repo/repo_repair.go b/cli/repo/repo_repair.go index f5f5b13d2..bc4936085 100644 --- a/cli/repo/repo_repair.go +++ b/cli/repo/repo_repair.go @@ -19,8 +19,8 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" ) var repoRepairCmd = &cli.Command{ diff --git a/cli/repo/repo_rm.go b/cli/repo/repo_rm.go index f4a863c40..7c0177a1d 100644 --- a/cli/repo/repo_rm.go +++ b/cli/repo/repo_rm.go @@ -19,8 +19,8 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" ) var repoRemoveCmd = &cli.Command{ diff --git a/cli/repo/repo_sync.go b/cli/repo/repo_sync.go index 830bb7c70..acb4801ab 100644 --- a/cli/repo/repo_sync.go +++ b/cli/repo/repo_sync.go @@ -20,8 +20,8 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" ) var repoSyncCmd = &cli.Command{ diff --git a/cli/repo/repo_update.go b/cli/repo/repo_update.go index 35913ad97..6f1cdd886 100644 --- a/cli/repo/repo_update.go +++ b/cli/repo/repo_update.go @@ -20,9 +20,9 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" - "go.woodpecker-ci.org/woodpecker/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" ) var repoUpdateCmd = &cli.Command{ diff --git a/cli/secret/secret.go b/cli/secret/secret.go index 1a7a0ec05..f953d0315 100644 --- a/cli/secret/secret.go +++ b/cli/secret/secret.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" - "go.woodpecker-ci.org/woodpecker/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" ) // Command exports the secret command. diff --git a/cli/secret/secret_add.go b/cli/secret/secret_add.go index 1637edfe4..8a49a29cb 100644 --- a/cli/secret/secret_add.go +++ b/cli/secret/secret_add.go @@ -20,9 +20,9 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" - "go.woodpecker-ci.org/woodpecker/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" ) var secretCreateCmd = &cli.Command{ diff --git a/cli/secret/secret_info.go b/cli/secret/secret_info.go index 60ff6b113..fa14e4982 100644 --- a/cli/secret/secret_info.go +++ b/cli/secret/secret_info.go @@ -20,9 +20,9 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" - "go.woodpecker-ci.org/woodpecker/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" ) var secretInfoCmd = &cli.Command{ diff --git a/cli/secret/secret_list.go b/cli/secret/secret_list.go index ec89a1e8c..bcf7122fc 100644 --- a/cli/secret/secret_list.go +++ b/cli/secret/secret_list.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" - "go.woodpecker-ci.org/woodpecker/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" ) var secretListCmd = &cli.Command{ diff --git a/cli/secret/secret_rm.go b/cli/secret/secret_rm.go index 38f06f277..3691eb95b 100644 --- a/cli/secret/secret_rm.go +++ b/cli/secret/secret_rm.go @@ -17,8 +17,8 @@ package secret import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" ) var secretDeleteCmd = &cli.Command{ diff --git a/cli/secret/secret_set.go b/cli/secret/secret_set.go index 485f11c11..7923046c8 100644 --- a/cli/secret/secret_set.go +++ b/cli/secret/secret_set.go @@ -20,9 +20,9 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" - "go.woodpecker-ci.org/woodpecker/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" ) var secretUpdateCmd = &cli.Command{ diff --git a/cli/user/user.go b/cli/user/user.go index 5900a7a15..4d7f24313 100644 --- a/cli/user/user.go +++ b/cli/user/user.go @@ -17,7 +17,7 @@ package user import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" ) // Command exports the user command set. diff --git a/cli/user/user_add.go b/cli/user/user_add.go index 10551497e..1baea6971 100644 --- a/cli/user/user_add.go +++ b/cli/user/user_add.go @@ -19,9 +19,9 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" - "go.woodpecker-ci.org/woodpecker/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" ) var userAddCmd = &cli.Command{ diff --git a/cli/user/user_info.go b/cli/user/user_info.go index 896e39725..3e9b3f148 100644 --- a/cli/user/user_info.go +++ b/cli/user/user_info.go @@ -21,8 +21,8 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" ) var userInfoCmd = &cli.Command{ diff --git a/cli/user/user_list.go b/cli/user/user_list.go index d7ffe937c..b1cd7dc8b 100644 --- a/cli/user/user_list.go +++ b/cli/user/user_list.go @@ -20,8 +20,8 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" ) var userListCmd = &cli.Command{ diff --git a/cli/user/user_rm.go b/cli/user/user_rm.go index d3b4baf00..128d74797 100644 --- a/cli/user/user_rm.go +++ b/cli/user/user_rm.go @@ -19,8 +19,8 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/internal" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/internal" ) var userRemoveCmd = &cli.Command{ diff --git a/cmd/agent/agent.go b/cmd/agent/agent.go index f2d7d2246..198f1a4bb 100644 --- a/cmd/agent/agent.go +++ b/cmd/agent/agent.go @@ -37,14 +37,14 @@ import ( "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" - "go.woodpecker-ci.org/woodpecker/agent" - agentRpc "go.woodpecker-ci.org/woodpecker/agent/rpc" - "go.woodpecker-ci.org/woodpecker/cmd/common" - "go.woodpecker-ci.org/woodpecker/pipeline/backend" - "go.woodpecker-ci.org/woodpecker/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/shared/utils" - "go.woodpecker-ci.org/woodpecker/version" + "go.woodpecker-ci.org/woodpecker/v2/agent" + agentRpc "go.woodpecker-ci.org/woodpecker/v2/agent/rpc" + "go.woodpecker-ci.org/woodpecker/v2/cmd/common" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + "go.woodpecker-ci.org/woodpecker/v2/version" ) func run(c *cli.Context) error { diff --git a/cmd/agent/health.go b/cmd/agent/health.go index b55ad0e21..0a508f07c 100644 --- a/cmd/agent/health.go +++ b/cmd/agent/health.go @@ -23,8 +23,8 @@ import ( "github.com/rs/zerolog/log" "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/agent" - "go.woodpecker-ci.org/woodpecker/version" + "go.woodpecker-ci.org/woodpecker/v2/agent" + "go.woodpecker-ci.org/woodpecker/v2/version" ) // the file implements some basic healthcheck logic based on the diff --git a/cmd/agent/health_test.go b/cmd/agent/health_test.go index 4cf8ae1af..04d297cf5 100644 --- a/cmd/agent/health_test.go +++ b/cmd/agent/health_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - "go.woodpecker-ci.org/woodpecker/agent" + "go.woodpecker-ci.org/woodpecker/v2/agent" ) func TestHealthy(t *testing.T) { diff --git a/cmd/agent/main.go b/cmd/agent/main.go index 7b10e87c1..8cbd4e054 100644 --- a/cmd/agent/main.go +++ b/cmd/agent/main.go @@ -21,12 +21,12 @@ import ( _ "github.com/joho/godotenv/autoload" "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cmd/common" - "go.woodpecker-ci.org/woodpecker/pipeline/backend/docker" - "go.woodpecker-ci.org/woodpecker/pipeline/backend/kubernetes" - "go.woodpecker-ci.org/woodpecker/pipeline/backend/local" - "go.woodpecker-ci.org/woodpecker/shared/utils" - "go.woodpecker-ci.org/woodpecker/version" + "go.woodpecker-ci.org/woodpecker/v2/cmd/common" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/docker" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/kubernetes" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/local" + "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + "go.woodpecker-ci.org/woodpecker/v2/version" ) func main() { diff --git a/cmd/cli/app.go b/cmd/cli/app.go index d98ffc19e..720529011 100644 --- a/cmd/cli/app.go +++ b/cmd/cli/app.go @@ -17,20 +17,20 @@ package main import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cli/common" - "go.woodpecker-ci.org/woodpecker/cli/cron" - "go.woodpecker-ci.org/woodpecker/cli/deploy" - "go.woodpecker-ci.org/woodpecker/cli/exec" - "go.woodpecker-ci.org/woodpecker/cli/info" - "go.woodpecker-ci.org/woodpecker/cli/lint" - "go.woodpecker-ci.org/woodpecker/cli/log" - "go.woodpecker-ci.org/woodpecker/cli/loglevel" - "go.woodpecker-ci.org/woodpecker/cli/pipeline" - "go.woodpecker-ci.org/woodpecker/cli/registry" - "go.woodpecker-ci.org/woodpecker/cli/repo" - "go.woodpecker-ci.org/woodpecker/cli/secret" - "go.woodpecker-ci.org/woodpecker/cli/user" - "go.woodpecker-ci.org/woodpecker/version" + "go.woodpecker-ci.org/woodpecker/v2/cli/common" + "go.woodpecker-ci.org/woodpecker/v2/cli/cron" + "go.woodpecker-ci.org/woodpecker/v2/cli/deploy" + "go.woodpecker-ci.org/woodpecker/v2/cli/exec" + "go.woodpecker-ci.org/woodpecker/v2/cli/info" + "go.woodpecker-ci.org/woodpecker/v2/cli/lint" + "go.woodpecker-ci.org/woodpecker/v2/cli/log" + "go.woodpecker-ci.org/woodpecker/v2/cli/loglevel" + "go.woodpecker-ci.org/woodpecker/v2/cli/pipeline" + "go.woodpecker-ci.org/woodpecker/v2/cli/registry" + "go.woodpecker-ci.org/woodpecker/v2/cli/repo" + "go.woodpecker-ci.org/woodpecker/v2/cli/secret" + "go.woodpecker-ci.org/woodpecker/v2/cli/user" + "go.woodpecker-ci.org/woodpecker/v2/version" ) //go:generate go run docs.go app.go diff --git a/cmd/server/flags.go b/cmd/server/flags.go index 33a73317b..e81b30c6e 100644 --- a/cmd/server/flags.go +++ b/cmd/server/flags.go @@ -20,8 +20,8 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/cmd/common" - "go.woodpecker-ci.org/woodpecker/shared/constant" + "go.woodpecker-ci.org/woodpecker/v2/cmd/common" + "go.woodpecker-ci.org/woodpecker/v2/shared/constant" ) var flags = append([]cli.Flag{ diff --git a/cmd/server/main.go b/cmd/server/main.go index 2fa7c800a..72c1806c1 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -20,9 +20,9 @@ import ( _ "github.com/joho/godotenv/autoload" "github.com/urfave/cli/v2" - _ "go.woodpecker-ci.org/woodpecker/cmd/server/docs" + _ "go.woodpecker-ci.org/woodpecker/v2/cmd/server/docs" - "go.woodpecker-ci.org/woodpecker/version" + "go.woodpecker-ci.org/woodpecker/v2/version" ) func main() { diff --git a/cmd/server/server.go b/cmd/server/server.go index fae4f9b21..b95449fdd 100644 --- a/cmd/server/server.go +++ b/cmd/server/server.go @@ -34,25 +34,25 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/keepalive" - "go.woodpecker-ci.org/woodpecker/cmd/common" - "go.woodpecker-ci.org/woodpecker/pipeline/rpc/proto" - "go.woodpecker-ci.org/woodpecker/server" - "go.woodpecker-ci.org/woodpecker/server/cron" - "go.woodpecker-ci.org/woodpecker/server/forge" - woodpeckerGrpcServer "go.woodpecker-ci.org/woodpecker/server/grpc" - "go.woodpecker-ci.org/woodpecker/server/logging" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/plugins/config" - "go.woodpecker-ci.org/woodpecker/server/plugins/permissions" - "go.woodpecker-ci.org/woodpecker/server/pubsub" - "go.woodpecker-ci.org/woodpecker/server/router" - "go.woodpecker-ci.org/woodpecker/server/router/middleware" - "go.woodpecker-ci.org/woodpecker/server/store" - "go.woodpecker-ci.org/woodpecker/server/web" - "go.woodpecker-ci.org/woodpecker/shared/constant" - "go.woodpecker-ci.org/woodpecker/version" - // "go.woodpecker-ci.org/woodpecker/server/plugins/encryption" - // encryptedStore "go.woodpecker-ci.org/woodpecker/server/plugins/encryption/wrapper/store" + "go.woodpecker-ci.org/woodpecker/v2/cmd/common" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc/proto" + "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v2/server/cron" + "go.woodpecker-ci.org/woodpecker/v2/server/forge" + woodpeckerGrpcServer "go.woodpecker-ci.org/woodpecker/v2/server/grpc" + "go.woodpecker-ci.org/woodpecker/v2/server/logging" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/plugins/config" + "go.woodpecker-ci.org/woodpecker/v2/server/plugins/permissions" + "go.woodpecker-ci.org/woodpecker/v2/server/pubsub" + "go.woodpecker-ci.org/woodpecker/v2/server/router" + "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware" + "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v2/server/web" + "go.woodpecker-ci.org/woodpecker/v2/shared/constant" + "go.woodpecker-ci.org/woodpecker/v2/version" + // "go.woodpecker-ci.org/woodpecker/v2/server/plugins/encryption" + // encryptedStore "go.woodpecker-ci.org/woodpecker/v2/server/plugins/encryption/wrapper/store" ) func run(c *cli.Context) error { diff --git a/cmd/server/setup.go b/cmd/server/setup.go index 8caa0f995..b088a1931 100644 --- a/cmd/server/setup.go +++ b/cmd/server/setup.go @@ -34,21 +34,21 @@ import ( "github.com/urfave/cli/v2" "golang.org/x/sync/errgroup" - "go.woodpecker-ci.org/woodpecker/server" - "go.woodpecker-ci.org/woodpecker/server/cache" - "go.woodpecker-ci.org/woodpecker/server/forge" - "go.woodpecker-ci.org/woodpecker/server/forge/bitbucket" - "go.woodpecker-ci.org/woodpecker/server/forge/gitea" - "go.woodpecker-ci.org/woodpecker/server/forge/github" - "go.woodpecker-ci.org/woodpecker/server/forge/gitlab" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/plugins/environments" - "go.woodpecker-ci.org/woodpecker/server/plugins/registry" - "go.woodpecker-ci.org/woodpecker/server/plugins/secrets" - "go.woodpecker-ci.org/woodpecker/server/queue" - "go.woodpecker-ci.org/woodpecker/server/store" - "go.woodpecker-ci.org/woodpecker/server/store/datastore" - "go.woodpecker-ci.org/woodpecker/server/store/types" + "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v2/server/cache" + "go.woodpecker-ci.org/woodpecker/v2/server/forge" + "go.woodpecker-ci.org/woodpecker/v2/server/forge/bitbucket" + "go.woodpecker-ci.org/woodpecker/v2/server/forge/gitea" + "go.woodpecker-ci.org/woodpecker/v2/server/forge/github" + "go.woodpecker-ci.org/woodpecker/v2/server/forge/gitlab" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/plugins/environments" + "go.woodpecker-ci.org/woodpecker/v2/server/plugins/registry" + "go.woodpecker-ci.org/woodpecker/v2/server/plugins/secrets" + "go.woodpecker-ci.org/woodpecker/v2/server/queue" + "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v2/server/store/datastore" + "go.woodpecker-ci.org/woodpecker/v2/server/store/types" ) func setupStore(c *cli.Context) (store.Store, error) { diff --git a/cmd/server/swagger.go b/cmd/server/swagger.go index 1053f6374..97029b804 100644 --- a/cmd/server/swagger.go +++ b/cmd/server/swagger.go @@ -15,8 +15,8 @@ package main import ( - "go.woodpecker-ci.org/woodpecker/cmd/server/docs" - "go.woodpecker-ci.org/woodpecker/version" + "go.woodpecker-ci.org/woodpecker/v2/cmd/server/docs" + "go.woodpecker-ci.org/woodpecker/v2/version" ) // generate docs/swagger.json via: diff --git a/cmd/server/woodpecker_docs_gen.go b/cmd/server/woodpecker_docs_gen.go index ae7217e5b..081c0c615 100644 --- a/cmd/server/woodpecker_docs_gen.go +++ b/cmd/server/woodpecker_docs_gen.go @@ -25,7 +25,7 @@ import ( "os" "path" - "go.woodpecker-ci.org/woodpecker/cmd/server/docs" + "go.woodpecker-ci.org/woodpecker/v2/cmd/server/docs" ) func main() { diff --git a/docs/docs/92-development/01-getting-started.md b/docs/docs/92-development/01-getting-started.md index ee2b1d205..a8538d195 100644 --- a/docs/docs/92-development/01-getting-started.md +++ b/docs/docs/92-development/01-getting-started.md @@ -123,7 +123,7 @@ make test-frontend If you want to test a specific go file you can also use: ```bash -go test -race -timeout 30s go.woodpecker-ci.org/woodpecker/ +go test -race -timeout 30s go.woodpecker-ci.org/woodpecker/v2/ ``` Or you can open the test-file inside [VS-Code](#developing-with-vs-code) and run or debug the test by clicking on the inline commands: diff --git a/docs/versioned_docs/version-2.0/92-development/01-getting-started.md b/docs/versioned_docs/version-2.0/92-development/01-getting-started.md index ee2b1d205..a8538d195 100644 --- a/docs/versioned_docs/version-2.0/92-development/01-getting-started.md +++ b/docs/versioned_docs/version-2.0/92-development/01-getting-started.md @@ -123,7 +123,7 @@ make test-frontend If you want to test a specific go file you can also use: ```bash -go test -race -timeout 30s go.woodpecker-ci.org/woodpecker/ +go test -race -timeout 30s go.woodpecker-ci.org/woodpecker/v2/ ``` Or you can open the test-file inside [VS-Code](#developing-with-vs-code) and run or debug the test by clicking on the inline commands: diff --git a/go.mod b/go.mod index beae7556c..f05f575aa 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module go.woodpecker-ci.org/woodpecker +module go.woodpecker-ci.org/woodpecker/v2 go 1.21 diff --git a/pipeline/backend/backend.go b/pipeline/backend/backend.go index f1c07227f..13ef009d3 100644 --- a/pipeline/backend/backend.go +++ b/pipeline/backend/backend.go @@ -18,10 +18,10 @@ import ( "context" "fmt" - "go.woodpecker-ci.org/woodpecker/pipeline/backend/docker" - "go.woodpecker-ci.org/woodpecker/pipeline/backend/kubernetes" - "go.woodpecker-ci.org/woodpecker/pipeline/backend/local" - "go.woodpecker-ci.org/woodpecker/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/docker" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/kubernetes" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/local" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" ) var ( diff --git a/pipeline/backend/docker/convert.go b/pipeline/backend/docker/convert.go index 096dafc5c..f841bff1e 100644 --- a/pipeline/backend/docker/convert.go +++ b/pipeline/backend/docker/convert.go @@ -22,8 +22,8 @@ import ( "github.com/docker/docker/api/types/container" - "go.woodpecker-ci.org/woodpecker/pipeline/backend/common" - "go.woodpecker-ci.org/woodpecker/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/common" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" ) // returns a container configuration. diff --git a/pipeline/backend/docker/docker.go b/pipeline/backend/docker/docker.go index accba49d5..c942c2ceb 100644 --- a/pipeline/backend/docker/docker.go +++ b/pipeline/backend/docker/docker.go @@ -33,8 +33,8 @@ import ( "github.com/rs/zerolog/log" "github.com/urfave/cli/v2" - backend "go.woodpecker-ci.org/woodpecker/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/shared/utils" + backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v2/shared/utils" ) type docker struct { diff --git a/pipeline/backend/kubernetes/kubernetes.go b/pipeline/backend/kubernetes/kubernetes.go index 216c8cb60..bdb543bfc 100644 --- a/pipeline/backend/kubernetes/kubernetes.go +++ b/pipeline/backend/kubernetes/kubernetes.go @@ -24,7 +24,7 @@ import ( "time" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" "gopkg.in/yaml.v3" "github.com/urfave/cli/v2" diff --git a/pipeline/backend/kubernetes/pod.go b/pipeline/backend/kubernetes/pod.go index c9d2fd43e..48e046d32 100644 --- a/pipeline/backend/kubernetes/pod.go +++ b/pipeline/backend/kubernetes/pod.go @@ -24,8 +24,8 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "go.woodpecker-ci.org/woodpecker/pipeline/backend/common" - "go.woodpecker-ci.org/woodpecker/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/common" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" ) func Pod(namespace string, step *types.Step, labels, annotations map[string]string, goos string, secCtxConf SecurityContextConfig) (*v1.Pod, error) { diff --git a/pipeline/backend/local/clone.go b/pipeline/backend/local/clone.go index b659a090a..083c01820 100644 --- a/pipeline/backend/local/clone.go +++ b/pipeline/backend/local/clone.go @@ -26,7 +26,7 @@ import ( "strings" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" ) // checkGitCloneCap check if we have the git binary on hand diff --git a/pipeline/backend/local/local.go b/pipeline/backend/local/local.go index 698a3f0f9..ca67c1616 100644 --- a/pipeline/backend/local/local.go +++ b/pipeline/backend/local/local.go @@ -31,7 +31,7 @@ import ( "golang.org/x/text/encoding/unicode" "golang.org/x/text/transform" - "go.woodpecker-ci.org/woodpecker/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" ) type workflowState struct { diff --git a/pipeline/errors/error_test.go b/pipeline/errors/error_test.go index 5a3bb7455..50bdf9d34 100644 --- a/pipeline/errors/error_test.go +++ b/pipeline/errors/error_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/multierr" - pipeline_errors "go.woodpecker-ci.org/woodpecker/pipeline/errors" + pipeline_errors "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors" ) func TestGetPipelineErrors(t *testing.T) { diff --git a/pipeline/frontend/metadata.go b/pipeline/frontend/metadata.go index fac05e694..34134e03c 100644 --- a/pipeline/frontend/metadata.go +++ b/pipeline/frontend/metadata.go @@ -21,9 +21,9 @@ import ( "github.com/drone/envsubst" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/metadata" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/version" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/version" ) func EnvVarSubst(yaml string, environ map[string]string) (string, error) { diff --git a/pipeline/frontend/metadata/drone_compatibility_test.go b/pipeline/frontend/metadata/drone_compatibility_test.go index 58ab8920d..ff7713526 100644 --- a/pipeline/frontend/metadata/drone_compatibility_test.go +++ b/pipeline/frontend/metadata/drone_compatibility_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/metadata" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" ) func TestSetDroneEnviron(t *testing.T) { diff --git a/pipeline/frontend/metadata_test.go b/pipeline/frontend/metadata_test.go index c40253442..8729e4f0e 100644 --- a/pipeline/frontend/metadata_test.go +++ b/pipeline/frontend/metadata_test.go @@ -19,10 +19,10 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/metadata" - "go.woodpecker-ci.org/woodpecker/server/forge/mocks" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" + "go.woodpecker-ci.org/woodpecker/v2/server/forge/mocks" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func TestEnvVarSubst(t *testing.T) { diff --git a/pipeline/frontend/yaml/compiler/cacher.go b/pipeline/frontend/yaml/compiler/cacher.go index db56a613a..8e57f5f0f 100644 --- a/pipeline/frontend/yaml/compiler/cacher.go +++ b/pipeline/frontend/yaml/compiler/cacher.go @@ -18,7 +18,7 @@ import ( "path" "strings" - yaml_types "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml/types" + yaml_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types" ) // Cacher defines a compiler transform that can be used diff --git a/pipeline/frontend/yaml/compiler/compiler.go b/pipeline/frontend/yaml/compiler/compiler.go index 0652f0fd4..3617391f6 100644 --- a/pipeline/frontend/yaml/compiler/compiler.go +++ b/pipeline/frontend/yaml/compiler/compiler.go @@ -18,11 +18,11 @@ import ( "fmt" "path" - backend_types "go.woodpecker-ci.org/woodpecker/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/metadata" - yaml_types "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml/types" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml/utils" - "go.woodpecker-ci.org/woodpecker/shared/constant" + backend_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" + yaml_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/utils" + "go.woodpecker-ci.org/woodpecker/v2/shared/constant" ) const ( diff --git a/pipeline/frontend/yaml/compiler/compiler_test.go b/pipeline/frontend/yaml/compiler/compiler_test.go index 9734082ed..2d5ebeafd 100644 --- a/pipeline/frontend/yaml/compiler/compiler_test.go +++ b/pipeline/frontend/yaml/compiler/compiler_test.go @@ -19,11 +19,11 @@ import ( "github.com/stretchr/testify/assert" - backend_types "go.woodpecker-ci.org/woodpecker/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/metadata" - yaml_types "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml/types" - yaml_base_types "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml/types/base" - "go.woodpecker-ci.org/woodpecker/shared/constant" + backend_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" + yaml_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types" + yaml_base_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types/base" + "go.woodpecker-ci.org/woodpecker/v2/shared/constant" ) func TestSecretAvailable(t *testing.T) { diff --git a/pipeline/frontend/yaml/compiler/convert.go b/pipeline/frontend/yaml/compiler/convert.go index cda2de9fd..93aa24dc8 100644 --- a/pipeline/frontend/yaml/compiler/convert.go +++ b/pipeline/frontend/yaml/compiler/convert.go @@ -22,11 +22,11 @@ import ( "github.com/google/uuid" - backend_types "go.woodpecker-ci.org/woodpecker/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/metadata" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml/compiler/settings" - yaml_types "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml/types" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml/utils" + backend_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/compiler/settings" + yaml_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/utils" ) func (c *Compiler) createProcess(name string, container *yaml_types.Container, stepType backend_types.StepType) (*backend_types.Step, error) { diff --git a/pipeline/frontend/yaml/compiler/option.go b/pipeline/frontend/yaml/compiler/option.go index 81e2442b5..afe9dfe95 100644 --- a/pipeline/frontend/yaml/compiler/option.go +++ b/pipeline/frontend/yaml/compiler/option.go @@ -19,7 +19,7 @@ import ( "path" "strings" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/metadata" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" ) // Option configures a compiler option. diff --git a/pipeline/frontend/yaml/compiler/option_test.go b/pipeline/frontend/yaml/compiler/option_test.go index a3ca233ae..a485dbdeb 100644 --- a/pipeline/frontend/yaml/compiler/option_test.go +++ b/pipeline/frontend/yaml/compiler/option_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/metadata" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" ) func TestWithWorkspace(t *testing.T) { diff --git a/pipeline/frontend/yaml/constraint/constraint.go b/pipeline/frontend/yaml/constraint/constraint.go index 28631cfdb..582753a1d 100644 --- a/pipeline/frontend/yaml/constraint/constraint.go +++ b/pipeline/frontend/yaml/constraint/constraint.go @@ -25,8 +25,8 @@ import ( "go.uber.org/multierr" "gopkg.in/yaml.v3" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/metadata" - yamlBaseTypes "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml/types/base" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" + yamlBaseTypes "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types/base" ) type ( diff --git a/pipeline/frontend/yaml/constraint/constraint_test.go b/pipeline/frontend/yaml/constraint/constraint_test.go index e8d3e363b..267fb4556 100644 --- a/pipeline/frontend/yaml/constraint/constraint_test.go +++ b/pipeline/frontend/yaml/constraint/constraint_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/assert" "gopkg.in/yaml.v3" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/metadata" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" ) func TestConstraint(t *testing.T) { diff --git a/pipeline/frontend/yaml/linter/error.go b/pipeline/frontend/yaml/linter/error.go index ab23e3412..c28a44ae8 100644 --- a/pipeline/frontend/yaml/linter/error.go +++ b/pipeline/frontend/yaml/linter/error.go @@ -15,7 +15,7 @@ package linter import ( - "go.woodpecker-ci.org/woodpecker/pipeline/errors" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors" ) func newLinterError(message, file, field string, isWarning bool) *errors.PipelineError { diff --git a/pipeline/frontend/yaml/linter/linter.go b/pipeline/frontend/yaml/linter/linter.go index 21241f088..6214b381a 100644 --- a/pipeline/frontend/yaml/linter/linter.go +++ b/pipeline/frontend/yaml/linter/linter.go @@ -20,9 +20,9 @@ import ( "codeberg.org/6543/xyaml" "go.uber.org/multierr" - "go.woodpecker-ci.org/woodpecker/pipeline/errors" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml/linter/schema" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml/types" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/linter/schema" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types" ) // A Linter lints a pipeline configuration. diff --git a/pipeline/frontend/yaml/linter/linter_test.go b/pipeline/frontend/yaml/linter/linter_test.go index 63245f7ff..e658d937f 100644 --- a/pipeline/frontend/yaml/linter/linter_test.go +++ b/pipeline/frontend/yaml/linter/linter_test.go @@ -19,9 +19,9 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/pipeline/errors" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml/linter" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/linter" ) func TestLint(t *testing.T) { diff --git a/pipeline/frontend/yaml/linter/schema/schema_test.go b/pipeline/frontend/yaml/linter/schema/schema_test.go index 63bb0f694..6b1dfd1d4 100644 --- a/pipeline/frontend/yaml/linter/schema/schema_test.go +++ b/pipeline/frontend/yaml/linter/schema/schema_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml/linter/schema" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/linter/schema" ) func TestSchema(t *testing.T) { diff --git a/pipeline/frontend/yaml/matrix/matrix.go b/pipeline/frontend/yaml/matrix/matrix.go index 583b105b8..9abf3bd1a 100644 --- a/pipeline/frontend/yaml/matrix/matrix.go +++ b/pipeline/frontend/yaml/matrix/matrix.go @@ -17,7 +17,7 @@ package matrix import ( "strings" - "go.woodpecker-ci.org/woodpecker/pipeline/errors" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors" "codeberg.org/6543/xyaml" ) diff --git a/pipeline/frontend/yaml/parse.go b/pipeline/frontend/yaml/parse.go index 16e2b9be5..f919b5814 100644 --- a/pipeline/frontend/yaml/parse.go +++ b/pipeline/frontend/yaml/parse.go @@ -20,10 +20,10 @@ import ( "codeberg.org/6543/xyaml" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml/constraint" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml/types" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml/types/base" - "go.woodpecker-ci.org/woodpecker/shared/constant" + "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") diff --git a/pipeline/frontend/yaml/parse_test.go b/pipeline/frontend/yaml/parse_test.go index 31d9775e2..904d59955 100644 --- a/pipeline/frontend/yaml/parse_test.go +++ b/pipeline/frontend/yaml/parse_test.go @@ -20,8 +20,8 @@ import ( "github.com/franela/goblin" "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/metadata" - yaml_base_types "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml/types/base" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" + yaml_base_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types/base" ) func TestParse(t *testing.T) { diff --git a/pipeline/frontend/yaml/types/container.go b/pipeline/frontend/yaml/types/container.go index 7088261a0..b50d3efcb 100644 --- a/pipeline/frontend/yaml/types/container.go +++ b/pipeline/frontend/yaml/types/container.go @@ -19,10 +19,10 @@ import ( "gopkg.in/yaml.v3" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml/constraint" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml/types/base" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml/utils" - "go.woodpecker-ci.org/woodpecker/shared/constant" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/constraint" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types/base" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/utils" + "go.woodpecker-ci.org/woodpecker/v2/shared/constant" ) type ( diff --git a/pipeline/frontend/yaml/types/container_test.go b/pipeline/frontend/yaml/types/container_test.go index 0adb0ae5a..429e5dbe6 100644 --- a/pipeline/frontend/yaml/types/container_test.go +++ b/pipeline/frontend/yaml/types/container_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/assert" "gopkg.in/yaml.v3" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml/constraint" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml/types/base" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/constraint" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types/base" ) var containerYaml = []byte(` diff --git a/pipeline/frontend/yaml/types/workflow.go b/pipeline/frontend/yaml/types/workflow.go index 005f3a907..f482fba37 100644 --- a/pipeline/frontend/yaml/types/workflow.go +++ b/pipeline/frontend/yaml/types/workflow.go @@ -15,8 +15,8 @@ package types import ( - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml/constraint" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml/types/base" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/constraint" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types/base" ) type ( diff --git a/pipeline/logger.go b/pipeline/logger.go index a61af5a0b..043dd798f 100644 --- a/pipeline/logger.go +++ b/pipeline/logger.go @@ -15,8 +15,8 @@ package pipeline import ( - backend "go.woodpecker-ci.org/woodpecker/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/pipeline/multipart" + backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/multipart" ) // Logger handles the process logging. diff --git a/pipeline/option.go b/pipeline/option.go index 1f5a98bd3..27bcd9c68 100644 --- a/pipeline/option.go +++ b/pipeline/option.go @@ -17,7 +17,7 @@ package pipeline import ( "context" - backend "go.woodpecker-ci.org/woodpecker/pipeline/backend/types" + backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" ) // Option configures a runtime option. diff --git a/pipeline/pipeline.go b/pipeline/pipeline.go index b5849b718..f777acfe2 100644 --- a/pipeline/pipeline.go +++ b/pipeline/pipeline.go @@ -26,9 +26,9 @@ import ( "github.com/rs/zerolog/log" "golang.org/x/sync/errgroup" - backend "go.woodpecker-ci.org/woodpecker/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/metadata" - "go.woodpecker-ci.org/woodpecker/pipeline/multipart" + backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/multipart" ) // TODO: move runtime into "runtime" subpackage diff --git a/pipeline/rpc/log_entry.go b/pipeline/rpc/log_entry.go index 4b238e706..e62ce7a07 100644 --- a/pipeline/rpc/log_entry.go +++ b/pipeline/rpc/log_entry.go @@ -23,7 +23,7 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/pipeline/shared" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/shared" ) // Identifies the type of line in the logs. diff --git a/pipeline/rpc/peer.go b/pipeline/rpc/peer.go index 5fbda400b..96265efdd 100644 --- a/pipeline/rpc/peer.go +++ b/pipeline/rpc/peer.go @@ -18,7 +18,7 @@ package rpc import ( "context" - backend "go.woodpecker-ci.org/woodpecker/pipeline/backend/types" + backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" ) type ( diff --git a/pipeline/rpc/proto/woodpecker.proto b/pipeline/rpc/proto/woodpecker.proto index f6cc00e8c..f61d86595 100644 --- a/pipeline/rpc/proto/woodpecker.proto +++ b/pipeline/rpc/proto/woodpecker.proto @@ -15,7 +15,7 @@ syntax = "proto3"; -option go_package = "go.woodpecker-ci.org/woodpecker/pipeline/rpc/proto"; +option go_package = "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc/proto"; package proto; // !IMPORTANT! diff --git a/pipeline/stepBuilder.go b/pipeline/stepBuilder.go index 05b28cc21..84c528475 100644 --- a/pipeline/stepBuilder.go +++ b/pipeline/stepBuilder.go @@ -24,20 +24,20 @@ import ( "github.com/rs/zerolog/log" "go.uber.org/multierr" - backend_types "go.woodpecker-ci.org/woodpecker/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/pipeline/errors" - pipeline_errors "go.woodpecker-ci.org/woodpecker/pipeline/errors" - yaml_types "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml/types" - forge_types "go.woodpecker-ci.org/woodpecker/server/forge/types" + backend_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors" + pipeline_errors "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors" + yaml_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types" + forge_types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/metadata" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml/compiler" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml/linter" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml/matrix" - "go.woodpecker-ci.org/woodpecker/server" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/compiler" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/linter" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/matrix" + "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) // StepBuilder Takes the hook data and the yaml and returns in internal data model diff --git a/pipeline/stepBuilder_test.go b/pipeline/stepBuilder_test.go index e171677c4..f9d04681d 100644 --- a/pipeline/stepBuilder_test.go +++ b/pipeline/stepBuilder_test.go @@ -21,10 +21,10 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/server/forge" - "go.woodpecker-ci.org/woodpecker/server/forge/mocks" - forge_types "go.woodpecker-ci.org/woodpecker/server/forge/types" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/forge" + "go.woodpecker-ci.org/woodpecker/v2/server/forge/mocks" + forge_types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func TestGlobalEnvsubst(t *testing.T) { diff --git a/server/api/agent.go b/server/api/agent.go index 9a7312281..36bbb0429 100644 --- a/server/api/agent.go +++ b/server/api/agent.go @@ -22,10 +22,10 @@ import ( "github.com/gin-gonic/gin" "github.com/gorilla/securecookie" - "go.woodpecker-ci.org/woodpecker/server" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/server/store" + "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v2/server/store" ) // GetAgents diff --git a/server/api/badge.go b/server/api/badge.go index 2c60f9bc4..152fbef6c 100644 --- a/server/api/badge.go +++ b/server/api/badge.go @@ -27,12 +27,12 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/server" - "go.woodpecker-ci.org/woodpecker/server/badges" - "go.woodpecker-ci.org/woodpecker/server/ccmenu" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/store" - "go.woodpecker-ci.org/woodpecker/server/store/types" + "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v2/server/badges" + "go.woodpecker-ci.org/woodpecker/v2/server/ccmenu" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v2/server/store/types" ) // GetBadge diff --git a/server/api/cron.go b/server/api/cron.go index 5a4b00c2b..f1f1a48a3 100644 --- a/server/api/cron.go +++ b/server/api/cron.go @@ -21,12 +21,12 @@ import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/server" - cronScheduler "go.woodpecker-ci.org/woodpecker/server/cron" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/pipeline" - "go.woodpecker-ci.org/woodpecker/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/server/store" + "go.woodpecker-ci.org/woodpecker/v2/server" + cronScheduler "go.woodpecker-ci.org/woodpecker/v2/server/cron" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/pipeline" + "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v2/server/store" ) // GetCron diff --git a/server/api/global_secret.go b/server/api/global_secret.go index 8de6f10eb..d6f992811 100644 --- a/server/api/global_secret.go +++ b/server/api/global_secret.go @@ -19,10 +19,10 @@ import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/server" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) // GetGlobalSecretList diff --git a/server/api/helper.go b/server/api/helper.go index 2ddf31d08..d4d1da899 100644 --- a/server/api/helper.go +++ b/server/api/helper.go @@ -20,12 +20,12 @@ import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/server" - "go.woodpecker-ci.org/woodpecker/server/forge" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/pipeline" - "go.woodpecker-ci.org/woodpecker/server/store" - "go.woodpecker-ci.org/woodpecker/server/store/types" + "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v2/server/forge" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/pipeline" + "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v2/server/store/types" ) func handlePipelineErr(c *gin.Context, err error) { diff --git a/server/api/helper_test.go b/server/api/helper_test.go index d12a9cc01..485451cce 100644 --- a/server/api/helper_test.go +++ b/server/api/helper_test.go @@ -7,7 +7,7 @@ import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/server/pipeline" + "go.woodpecker-ci.org/woodpecker/v2/server/pipeline" ) func TestHandlePipelineError(t *testing.T) { diff --git a/server/api/hook.go b/server/api/hook.go index 0f9573638..0d3a9b53d 100644 --- a/server/api/hook.go +++ b/server/api/hook.go @@ -26,12 +26,12 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/server" - "go.woodpecker-ci.org/woodpecker/server/forge/types" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/pipeline" - "go.woodpecker-ci.org/woodpecker/server/store" - "go.woodpecker-ci.org/woodpecker/shared/token" + "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/pipeline" + "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v2/shared/token" ) // GetQueueInfo diff --git a/server/api/login.go b/server/api/login.go index ae95e67c4..29d25d7b1 100644 --- a/server/api/login.go +++ b/server/api/login.go @@ -24,12 +24,12 @@ import ( "github.com/gorilla/securecookie" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/server" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/store" - "go.woodpecker-ci.org/woodpecker/server/store/types" - "go.woodpecker-ci.org/woodpecker/shared/httputil" - "go.woodpecker-ci.org/woodpecker/shared/token" + "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v2/server/store/types" + "go.woodpecker-ci.org/woodpecker/v2/shared/httputil" + "go.woodpecker-ci.org/woodpecker/v2/shared/token" ) func HandleLogin(c *gin.Context) { diff --git a/server/api/metrics/prometheus.go b/server/api/metrics/prometheus.go index c2d796ccd..a7a7793b5 100644 --- a/server/api/metrics/prometheus.go +++ b/server/api/metrics/prometheus.go @@ -22,7 +22,7 @@ import ( "github.com/gin-gonic/gin" "github.com/prometheus/client_golang/prometheus/promhttp" - "go.woodpecker-ci.org/woodpecker/server" + "go.woodpecker-ci.org/woodpecker/v2/server" ) // errInvalidToken is returned when the api request token is invalid. diff --git a/server/api/org.go b/server/api/org.go index fc412ab97..e3b599999 100644 --- a/server/api/org.go +++ b/server/api/org.go @@ -23,10 +23,10 @@ import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/server" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/server/store" + "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v2/server/store" ) // GetOrg diff --git a/server/api/org_secret.go b/server/api/org_secret.go index 1fcb17464..dbda4c4a5 100644 --- a/server/api/org_secret.go +++ b/server/api/org_secret.go @@ -20,10 +20,10 @@ import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/server" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) // GetOrgSecret diff --git a/server/api/orgs.go b/server/api/orgs.go index b794b04d4..e54f77eb1 100644 --- a/server/api/orgs.go +++ b/server/api/orgs.go @@ -20,8 +20,8 @@ import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/server/store" + "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v2/server/store" ) // GetOrgs diff --git a/server/api/pipeline.go b/server/api/pipeline.go index 8c4897d50..6277fdf4b 100644 --- a/server/api/pipeline.go +++ b/server/api/pipeline.go @@ -28,11 +28,11 @@ import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/server" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/pipeline" - "go.woodpecker-ci.org/woodpecker/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/server/store" + "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/pipeline" + "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v2/server/store" ) // CreatePipeline diff --git a/server/api/registry.go b/server/api/registry.go index 8c42004e7..731084ab7 100644 --- a/server/api/registry.go +++ b/server/api/registry.go @@ -19,9 +19,9 @@ import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/server" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" ) // GetRegistry diff --git a/server/api/repo.go b/server/api/repo.go index 38fa3060e..94767a17f 100644 --- a/server/api/repo.go +++ b/server/api/repo.go @@ -27,12 +27,12 @@ import ( "github.com/gorilla/securecookie" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/server" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/server/store" - "go.woodpecker-ci.org/woodpecker/server/store/types" - "go.woodpecker-ci.org/woodpecker/shared/token" + "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v2/server/store/types" + "go.woodpecker-ci.org/woodpecker/v2/shared/token" ) // PostRepo diff --git a/server/api/repo_secret.go b/server/api/repo_secret.go index 079418fb9..84fe4ca7b 100644 --- a/server/api/repo_secret.go +++ b/server/api/repo_secret.go @@ -20,9 +20,9 @@ import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/server" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" ) // GetSecret diff --git a/server/api/signature_public_key.go b/server/api/signature_public_key.go index ab0f82e1d..0846f0c96 100644 --- a/server/api/signature_public_key.go +++ b/server/api/signature_public_key.go @@ -21,7 +21,7 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/server" + "go.woodpecker-ci.org/woodpecker/v2/server" ) // GetSignaturePublicKey diff --git a/server/api/stream.go b/server/api/stream.go index 9dac673a3..7e40dcc36 100644 --- a/server/api/stream.go +++ b/server/api/stream.go @@ -27,11 +27,11 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/server" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/pubsub" - "go.woodpecker-ci.org/woodpecker/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/server/store" + "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/pubsub" + "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v2/server/store" ) // EventStreamSSE diff --git a/server/api/user.go b/server/api/user.go index 8c85df89d..d9c06d43f 100644 --- a/server/api/user.go +++ b/server/api/user.go @@ -22,11 +22,11 @@ import ( "github.com/gin-gonic/gin" "github.com/gorilla/securecookie" - "go.woodpecker-ci.org/woodpecker/server" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/server/store" - "go.woodpecker-ci.org/woodpecker/shared/token" + "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v2/shared/token" ) // GetSelf diff --git a/server/api/users.go b/server/api/users.go index 76f8a299c..5769d4c02 100644 --- a/server/api/users.go +++ b/server/api/users.go @@ -21,9 +21,9 @@ import ( "github.com/gin-gonic/gin" "github.com/gorilla/securecookie" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/server/store" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v2/server/store" ) // GetUsers diff --git a/server/api/z.go b/server/api/z.go index e86f7112e..1c3ccb9f0 100644 --- a/server/api/z.go +++ b/server/api/z.go @@ -21,8 +21,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/server/store" - "go.woodpecker-ci.org/woodpecker/version" + "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v2/version" ) // Health diff --git a/server/badges/badges.go b/server/badges/badges.go index fd530806f..528af0922 100644 --- a/server/badges/badges.go +++ b/server/badges/badges.go @@ -14,7 +14,7 @@ package badges -import "go.woodpecker-ci.org/woodpecker/server/model" +import "go.woodpecker-ci.org/woodpecker/v2/server/model" var ( badgeSuccess = `pipeline: successpipelinesuccess` diff --git a/server/badges/badges_test.go b/server/badges/badges_test.go index f0773beef..d8953c37d 100644 --- a/server/badges/badges_test.go +++ b/server/badges/badges_test.go @@ -18,7 +18,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) // Generate an SVG badge based on a pipeline diff --git a/server/cache/membership.go b/server/cache/membership.go index 9c575cd2b..233d7fd08 100644 --- a/server/cache/membership.go +++ b/server/cache/membership.go @@ -19,8 +19,8 @@ import ( "fmt" "time" - "go.woodpecker-ci.org/woodpecker/server/forge" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/forge" + "go.woodpecker-ci.org/woodpecker/v2/server/model" "github.com/jellydator/ttlcache/v3" ) diff --git a/server/ccmenu/cc.go b/server/ccmenu/cc.go index 81179f9e8..6c8b77763 100644 --- a/server/ccmenu/cc.go +++ b/server/ccmenu/cc.go @@ -20,7 +20,7 @@ import ( "strconv" "time" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) // CCMenu displays the pipeline status of projects on a ci server as an item in the Mac's menu bar. diff --git a/server/ccmenu/cc_test.go b/server/ccmenu/cc_test.go index 249d78d81..316b68394 100644 --- a/server/ccmenu/cc_test.go +++ b/server/ccmenu/cc_test.go @@ -21,7 +21,7 @@ import ( "github.com/franela/goblin" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func TestCC(t *testing.T) { diff --git a/server/config.go b/server/config.go index 0c450375f..abb1badc2 100644 --- a/server/config.go +++ b/server/config.go @@ -21,14 +21,14 @@ import ( "crypto" "time" - "go.woodpecker-ci.org/woodpecker/server/cache" - "go.woodpecker-ci.org/woodpecker/server/forge" - "go.woodpecker-ci.org/woodpecker/server/logging" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/plugins/config" - "go.woodpecker-ci.org/woodpecker/server/plugins/permissions" - "go.woodpecker-ci.org/woodpecker/server/pubsub" - "go.woodpecker-ci.org/woodpecker/server/queue" + "go.woodpecker-ci.org/woodpecker/v2/server/cache" + "go.woodpecker-ci.org/woodpecker/v2/server/forge" + "go.woodpecker-ci.org/woodpecker/v2/server/logging" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/plugins/config" + "go.woodpecker-ci.org/woodpecker/v2/server/plugins/permissions" + "go.woodpecker-ci.org/woodpecker/v2/server/pubsub" + "go.woodpecker-ci.org/woodpecker/v2/server/queue" ) var Config = struct { diff --git a/server/cron/cron.go b/server/cron/cron.go index 5e8e8a498..78361d46e 100644 --- a/server/cron/cron.go +++ b/server/cron/cron.go @@ -22,10 +22,10 @@ import ( "github.com/robfig/cron" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/server/forge" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/pipeline" - "go.woodpecker-ci.org/woodpecker/server/store" + "go.woodpecker-ci.org/woodpecker/v2/server/forge" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/pipeline" + "go.woodpecker-ci.org/woodpecker/v2/server/store" ) const ( diff --git a/server/cron/cron_test.go b/server/cron/cron_test.go index 69809be56..450831bdb 100644 --- a/server/cron/cron_test.go +++ b/server/cron/cron_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - mocks_forge "go.woodpecker-ci.org/woodpecker/server/forge/mocks" - "go.woodpecker-ci.org/woodpecker/server/model" - mocks_store "go.woodpecker-ci.org/woodpecker/server/store/mocks" + mocks_forge "go.woodpecker-ci.org/woodpecker/v2/server/forge/mocks" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + mocks_store "go.woodpecker-ci.org/woodpecker/v2/server/store/mocks" ) func TestCreateBuild(t *testing.T) { diff --git a/server/forge/bitbucket/bitbucket.go b/server/forge/bitbucket/bitbucket.go index e88d89a75..c1df1efad 100644 --- a/server/forge/bitbucket/bitbucket.go +++ b/server/forge/bitbucket/bitbucket.go @@ -25,13 +25,13 @@ import ( "golang.org/x/oauth2" - "go.woodpecker-ci.org/woodpecker/server" - "go.woodpecker-ci.org/woodpecker/server/forge" - "go.woodpecker-ci.org/woodpecker/server/forge/bitbucket/internal" - "go.woodpecker-ci.org/woodpecker/server/forge/common" - forge_types "go.woodpecker-ci.org/woodpecker/server/forge/types" - "go.woodpecker-ci.org/woodpecker/server/model" - shared_utils "go.woodpecker-ci.org/woodpecker/shared/utils" + "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v2/server/forge" + "go.woodpecker-ci.org/woodpecker/v2/server/forge/bitbucket/internal" + "go.woodpecker-ci.org/woodpecker/v2/server/forge/common" + forge_types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + shared_utils "go.woodpecker-ci.org/woodpecker/v2/shared/utils" ) // Bitbucket cloud endpoints. diff --git a/server/forge/bitbucket/bitbucket_test.go b/server/forge/bitbucket/bitbucket_test.go index 99b96838a..ee118d156 100644 --- a/server/forge/bitbucket/bitbucket_test.go +++ b/server/forge/bitbucket/bitbucket_test.go @@ -25,9 +25,9 @@ import ( "github.com/franela/goblin" "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/server/forge/bitbucket/fixtures" - "go.woodpecker-ci.org/woodpecker/server/forge/bitbucket/internal" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/forge/bitbucket/fixtures" + "go.woodpecker-ci.org/woodpecker/v2/server/forge/bitbucket/internal" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func Test_bitbucket(t *testing.T) { diff --git a/server/forge/bitbucket/convert.go b/server/forge/bitbucket/convert.go index b6cd42a83..286d3e0b8 100644 --- a/server/forge/bitbucket/convert.go +++ b/server/forge/bitbucket/convert.go @@ -23,8 +23,8 @@ import ( "golang.org/x/oauth2" - "go.woodpecker-ci.org/woodpecker/server/forge/bitbucket/internal" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/forge/bitbucket/internal" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) const ( diff --git a/server/forge/bitbucket/convert_test.go b/server/forge/bitbucket/convert_test.go index 5ab3f7cf1..88a9ef7cc 100644 --- a/server/forge/bitbucket/convert_test.go +++ b/server/forge/bitbucket/convert_test.go @@ -22,8 +22,8 @@ import ( "github.com/franela/goblin" "golang.org/x/oauth2" - "go.woodpecker-ci.org/woodpecker/server/forge/bitbucket/internal" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/forge/bitbucket/internal" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func Test_helper(t *testing.T) { diff --git a/server/forge/bitbucket/internal/client.go b/server/forge/bitbucket/internal/client.go index 32839e087..8d832e8c1 100644 --- a/server/forge/bitbucket/internal/client.go +++ b/server/forge/bitbucket/internal/client.go @@ -23,7 +23,7 @@ import ( "net/http" "net/url" - shared_utils "go.woodpecker-ci.org/woodpecker/shared/utils" + shared_utils "go.woodpecker-ci.org/woodpecker/v2/shared/utils" "golang.org/x/oauth2" "golang.org/x/oauth2/bitbucket" diff --git a/server/forge/bitbucket/parse.go b/server/forge/bitbucket/parse.go index c62c4fea5..7b22f345a 100644 --- a/server/forge/bitbucket/parse.go +++ b/server/forge/bitbucket/parse.go @@ -19,9 +19,9 @@ import ( "io" "net/http" - "go.woodpecker-ci.org/woodpecker/server/forge/bitbucket/internal" - "go.woodpecker-ci.org/woodpecker/server/forge/types" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/forge/bitbucket/internal" + "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) const ( diff --git a/server/forge/bitbucket/parse_test.go b/server/forge/bitbucket/parse_test.go index 17925ca92..915b2f685 100644 --- a/server/forge/bitbucket/parse_test.go +++ b/server/forge/bitbucket/parse_test.go @@ -22,9 +22,9 @@ import ( "github.com/franela/goblin" "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/server/forge/bitbucket/fixtures" - "go.woodpecker-ci.org/woodpecker/server/forge/types" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/forge/bitbucket/fixtures" + "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func Test_parser(t *testing.T) { diff --git a/server/forge/common/status.go b/server/forge/common/status.go index de8c01122..27fa3f93f 100644 --- a/server/forge/common/status.go +++ b/server/forge/common/status.go @@ -21,8 +21,8 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/server" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func GetPipelineStatusContext(repo *model.Repo, pipeline *model.Pipeline, workflow *model.Workflow) string { diff --git a/server/forge/common/status_test.go b/server/forge/common/status_test.go index b8adf7c84..cbf3fd9e1 100644 --- a/server/forge/common/status_test.go +++ b/server/forge/common/status_test.go @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/server" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func TestGetPipelineStatusContext(t *testing.T) { diff --git a/server/forge/common/utils.go b/server/forge/common/utils.go index b37b8154e..f82991f57 100644 --- a/server/forge/common/utils.go +++ b/server/forge/common/utils.go @@ -22,8 +22,8 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/store" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/store" ) func ExtractHostFromCloneURL(cloneURL string) (string, error) { diff --git a/server/forge/common/utils_test.go b/server/forge/common/utils_test.go index e559365c9..dd33be01f 100644 --- a/server/forge/common/utils_test.go +++ b/server/forge/common/utils_test.go @@ -17,7 +17,7 @@ package common_test import ( "testing" - "go.woodpecker-ci.org/woodpecker/server/forge/common" + "go.woodpecker-ci.org/woodpecker/v2/server/forge/common" ) func Test_Netrc(t *testing.T) { diff --git a/server/forge/configFetcher.go b/server/forge/configFetcher.go index a7eb1bc57..773b52e95 100644 --- a/server/forge/configFetcher.go +++ b/server/forge/configFetcher.go @@ -23,10 +23,10 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/server/forge/types" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/plugins/config" - "go.woodpecker-ci.org/woodpecker/shared/constant" + "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/plugins/config" + "go.woodpecker-ci.org/woodpecker/v2/shared/constant" ) type ConfigFetcher interface { diff --git a/server/forge/configFetcher_test.go b/server/forge/configFetcher_test.go index 9a91ed658..df4f29719 100644 --- a/server/forge/configFetcher_test.go +++ b/server/forge/configFetcher_test.go @@ -31,11 +31,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "go.woodpecker-ci.org/woodpecker/server/forge" - "go.woodpecker-ci.org/woodpecker/server/forge/mocks" - forge_types "go.woodpecker-ci.org/woodpecker/server/forge/types" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/plugins/config" + "go.woodpecker-ci.org/woodpecker/v2/server/forge" + "go.woodpecker-ci.org/woodpecker/v2/server/forge/mocks" + forge_types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/plugins/config" ) func TestFetch(t *testing.T) { diff --git a/server/forge/forge.go b/server/forge/forge.go index 4d23534fd..a9f163bb5 100644 --- a/server/forge/forge.go +++ b/server/forge/forge.go @@ -22,8 +22,8 @@ import ( "context" "net/http" - "go.woodpecker-ci.org/woodpecker/server/forge/types" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) // TODO: use pagination diff --git a/server/forge/gitea/gitea.go b/server/forge/gitea/gitea.go index 2b780cd81..13ba41693 100644 --- a/server/forge/gitea/gitea.go +++ b/server/forge/gitea/gitea.go @@ -35,13 +35,13 @@ import ( "github.com/rs/zerolog/log" "golang.org/x/oauth2" - "go.woodpecker-ci.org/woodpecker/server" - "go.woodpecker-ci.org/woodpecker/server/forge" - "go.woodpecker-ci.org/woodpecker/server/forge/common" - forge_types "go.woodpecker-ci.org/woodpecker/server/forge/types" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/store" - shared_utils "go.woodpecker-ci.org/woodpecker/shared/utils" + "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v2/server/forge" + "go.woodpecker-ci.org/woodpecker/v2/server/forge/common" + forge_types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/store" + shared_utils "go.woodpecker-ci.org/woodpecker/v2/shared/utils" ) const ( diff --git a/server/forge/gitea/gitea_test.go b/server/forge/gitea/gitea_test.go index d28e8ad7f..384aea57c 100644 --- a/server/forge/gitea/gitea_test.go +++ b/server/forge/gitea/gitea_test.go @@ -26,11 +26,11 @@ import ( "github.com/gin-gonic/gin" "github.com/stretchr/testify/mock" - "go.woodpecker-ci.org/woodpecker/server/forge/gitea/fixtures" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/store" - mocks_store "go.woodpecker-ci.org/woodpecker/server/store/mocks" - "go.woodpecker-ci.org/woodpecker/shared/utils" + "go.woodpecker-ci.org/woodpecker/v2/server/forge/gitea/fixtures" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/store" + mocks_store "go.woodpecker-ci.org/woodpecker/v2/server/store/mocks" + "go.woodpecker-ci.org/woodpecker/v2/shared/utils" ) func Test_gitea(t *testing.T) { diff --git a/server/forge/gitea/helper.go b/server/forge/gitea/helper.go index 843213b63..ce4709a5f 100644 --- a/server/forge/gitea/helper.go +++ b/server/forge/gitea/helper.go @@ -25,8 +25,8 @@ import ( "code.gitea.io/sdk/gitea" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/shared/utils" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/shared/utils" ) // helper function that converts a Gitea repository to a Woodpecker repository. diff --git a/server/forge/gitea/helper_test.go b/server/forge/gitea/helper_test.go index 8041dd988..e2972f8d2 100644 --- a/server/forge/gitea/helper_test.go +++ b/server/forge/gitea/helper_test.go @@ -22,9 +22,9 @@ import ( "code.gitea.io/sdk/gitea" "github.com/franela/goblin" - "go.woodpecker-ci.org/woodpecker/server/forge/gitea/fixtures" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/shared/utils" + "go.woodpecker-ci.org/woodpecker/v2/server/forge/gitea/fixtures" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/shared/utils" ) func Test_parse(t *testing.T) { diff --git a/server/forge/gitea/parse.go b/server/forge/gitea/parse.go index 0108516e2..fc4f42e9d 100644 --- a/server/forge/gitea/parse.go +++ b/server/forge/gitea/parse.go @@ -22,8 +22,8 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/server/forge/types" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) const ( diff --git a/server/forge/gitea/parse_test.go b/server/forge/gitea/parse_test.go index df6de29bb..1945b9508 100644 --- a/server/forge/gitea/parse_test.go +++ b/server/forge/gitea/parse_test.go @@ -23,10 +23,10 @@ import ( "github.com/franela/goblin" "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/server/forge/gitea/fixtures" - "go.woodpecker-ci.org/woodpecker/server/forge/types" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/shared/utils" + "go.woodpecker-ci.org/woodpecker/v2/server/forge/gitea/fixtures" + "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/shared/utils" ) func Test_parser(t *testing.T) { diff --git a/server/forge/github/convert.go b/server/forge/github/convert.go index 61ac88a1b..c8b968d69 100644 --- a/server/forge/github/convert.go +++ b/server/forge/github/convert.go @@ -20,7 +20,7 @@ import ( "github.com/google/go-github/v57/github" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) const ( diff --git a/server/forge/github/convert_test.go b/server/forge/github/convert_test.go index 38fdf5a56..d98d8fedf 100644 --- a/server/forge/github/convert_test.go +++ b/server/forge/github/convert_test.go @@ -21,7 +21,7 @@ import ( "github.com/franela/goblin" "github.com/google/go-github/v57/github" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func Test_helper(t *testing.T) { diff --git a/server/forge/github/github.go b/server/forge/github/github.go index f48767d67..4f5339cd8 100644 --- a/server/forge/github/github.go +++ b/server/forge/github/github.go @@ -29,13 +29,13 @@ import ( "github.com/rs/zerolog/log" "golang.org/x/oauth2" - "go.woodpecker-ci.org/woodpecker/server" - "go.woodpecker-ci.org/woodpecker/server/forge" - "go.woodpecker-ci.org/woodpecker/server/forge/common" - forge_types "go.woodpecker-ci.org/woodpecker/server/forge/types" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/store" - "go.woodpecker-ci.org/woodpecker/shared/utils" + "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v2/server/forge" + "go.woodpecker-ci.org/woodpecker/v2/server/forge/common" + forge_types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v2/shared/utils" ) const ( diff --git a/server/forge/github/github_test.go b/server/forge/github/github_test.go index 48c775d5a..219d42c92 100644 --- a/server/forge/github/github_test.go +++ b/server/forge/github/github_test.go @@ -23,8 +23,8 @@ import ( "github.com/franela/goblin" "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/server/forge/github/fixtures" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/forge/github/fixtures" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func Test_github(t *testing.T) { diff --git a/server/forge/github/parse.go b/server/forge/github/parse.go index 69326c3a2..e1937b4d3 100644 --- a/server/forge/github/parse.go +++ b/server/forge/github/parse.go @@ -24,9 +24,9 @@ import ( "github.com/google/go-github/v57/github" - "go.woodpecker-ci.org/woodpecker/server/forge/types" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/shared/utils" + "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/shared/utils" ) const ( diff --git a/server/forge/github/parse_test.go b/server/forge/github/parse_test.go index 0f00da573..d8208380c 100644 --- a/server/forge/github/parse_test.go +++ b/server/forge/github/parse_test.go @@ -24,9 +24,9 @@ import ( "github.com/franela/goblin" "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/server/forge/github/fixtures" - "go.woodpecker-ci.org/woodpecker/server/forge/types" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/forge/github/fixtures" + "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) const ( diff --git a/server/forge/gitlab/convert.go b/server/forge/gitlab/convert.go index d4f8acddc..f93b3d6cd 100644 --- a/server/forge/gitlab/convert.go +++ b/server/forge/gitlab/convert.go @@ -23,8 +23,8 @@ import ( "github.com/xanzy/go-gitlab" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/shared/utils" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/shared/utils" ) const ( diff --git a/server/forge/gitlab/gitlab.go b/server/forge/gitlab/gitlab.go index 3f4a57c65..3f450af3a 100644 --- a/server/forge/gitlab/gitlab.go +++ b/server/forge/gitlab/gitlab.go @@ -30,13 +30,13 @@ import ( "github.com/xanzy/go-gitlab" "golang.org/x/oauth2" - "go.woodpecker-ci.org/woodpecker/server" - "go.woodpecker-ci.org/woodpecker/server/forge" - "go.woodpecker-ci.org/woodpecker/server/forge/common" - forge_types "go.woodpecker-ci.org/woodpecker/server/forge/types" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/store" - "go.woodpecker-ci.org/woodpecker/shared/utils" + "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v2/server/forge" + "go.woodpecker-ci.org/woodpecker/v2/server/forge/common" + forge_types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v2/shared/utils" ) const ( diff --git a/server/forge/gitlab/gitlab_test.go b/server/forge/gitlab/gitlab_test.go index e887c6e10..c5c671fb6 100644 --- a/server/forge/gitlab/gitlab_test.go +++ b/server/forge/gitlab/gitlab_test.go @@ -26,8 +26,8 @@ import ( "github.com/franela/goblin" "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/server/forge/gitlab/testdata" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/forge/gitlab/testdata" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func load(t *testing.T, config string) *GitLab { diff --git a/server/forge/gitlab/status.go b/server/forge/gitlab/status.go index f7fdabf38..cc21b2463 100644 --- a/server/forge/gitlab/status.go +++ b/server/forge/gitlab/status.go @@ -17,7 +17,7 @@ package gitlab import ( "github.com/xanzy/go-gitlab" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) // getStatus is a helper that converts a Woodpecker status to a Gitlab status. diff --git a/server/forge/mocks/forge.go b/server/forge/mocks/forge.go index 09cb0bf41..612ed135e 100644 --- a/server/forge/mocks/forge.go +++ b/server/forge/mocks/forge.go @@ -9,9 +9,9 @@ import ( mock "github.com/stretchr/testify/mock" - model "go.woodpecker-ci.org/woodpecker/server/model" + model "go.woodpecker-ci.org/woodpecker/v2/server/model" - types "go.woodpecker-ci.org/woodpecker/server/forge/types" + types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" ) // Forge is an autogenerated mock type for the Forge type diff --git a/server/forge/refresh.go b/server/forge/refresh.go index 8a1d63d1d..dd904c91f 100644 --- a/server/forge/refresh.go +++ b/server/forge/refresh.go @@ -20,8 +20,8 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/store" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/store" ) // Refresher refreshes an oauth token and expiration for the given user. It diff --git a/server/grpc/auth_server.go b/server/grpc/auth_server.go index 140463e12..362e74b4c 100644 --- a/server/grpc/auth_server.go +++ b/server/grpc/auth_server.go @@ -21,10 +21,10 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/pipeline/rpc/proto" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/store" - "go.woodpecker-ci.org/woodpecker/server/store/types" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc/proto" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v2/server/store/types" ) type WoodpeckerAuthServer struct { diff --git a/server/grpc/filter.go b/server/grpc/filter.go index c6b6bd52a..30b34605c 100644 --- a/server/grpc/filter.go +++ b/server/grpc/filter.go @@ -15,9 +15,9 @@ package grpc import ( - "go.woodpecker-ci.org/woodpecker/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/queue" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/queue" ) func createFilterFunc(agentFilter rpc.Filter) (queue.FilterFn, error) { diff --git a/server/grpc/filter_test.go b/server/grpc/filter_test.go index e50dcecac..d3b06e91f 100644 --- a/server/grpc/filter_test.go +++ b/server/grpc/filter_test.go @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func TestCreateFilterFunc(t *testing.T) { diff --git a/server/grpc/rpc.go b/server/grpc/rpc.go index a0d9cf9d4..9665e16ee 100644 --- a/server/grpc/rpc.go +++ b/server/grpc/rpc.go @@ -30,14 +30,14 @@ import ( "github.com/rs/zerolog/log" grpcMetadata "google.golang.org/grpc/metadata" - "go.woodpecker-ci.org/woodpecker/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/server/forge" - "go.woodpecker-ci.org/woodpecker/server/logging" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/pipeline" - "go.woodpecker-ci.org/woodpecker/server/pubsub" - "go.woodpecker-ci.org/woodpecker/server/queue" - "go.woodpecker-ci.org/woodpecker/server/store" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v2/server/forge" + "go.woodpecker-ci.org/woodpecker/v2/server/logging" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/pipeline" + "go.woodpecker-ci.org/woodpecker/v2/server/pubsub" + "go.woodpecker-ci.org/woodpecker/v2/server/queue" + "go.woodpecker-ci.org/woodpecker/v2/server/store" ) type RPC struct { diff --git a/server/grpc/server.go b/server/grpc/server.go index 0795fd5be..aa20ddce2 100644 --- a/server/grpc/server.go +++ b/server/grpc/server.go @@ -21,14 +21,14 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "go.woodpecker-ci.org/woodpecker/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/pipeline/rpc/proto" - "go.woodpecker-ci.org/woodpecker/server/forge" - "go.woodpecker-ci.org/woodpecker/server/logging" - "go.woodpecker-ci.org/woodpecker/server/pubsub" - "go.woodpecker-ci.org/woodpecker/server/queue" - "go.woodpecker-ci.org/woodpecker/server/store" - "go.woodpecker-ci.org/woodpecker/version" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc/proto" + "go.woodpecker-ci.org/woodpecker/v2/server/forge" + "go.woodpecker-ci.org/woodpecker/v2/server/logging" + "go.woodpecker-ci.org/woodpecker/v2/server/pubsub" + "go.woodpecker-ci.org/woodpecker/v2/server/queue" + "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v2/version" ) // WoodpeckerServer is a grpc server implementation. diff --git a/server/logging/log.go b/server/logging/log.go index d63343e00..942902c84 100644 --- a/server/logging/log.go +++ b/server/logging/log.go @@ -18,7 +18,7 @@ import ( "context" "sync" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) // TODO (bradrydzewski) writing to subscribers is currently a blocking diff --git a/server/logging/log_test.go b/server/logging/log_test.go index 94dd92278..ffa4166d3 100644 --- a/server/logging/log_test.go +++ b/server/logging/log_test.go @@ -21,7 +21,7 @@ import ( "time" "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func TestLogging(t *testing.T) { diff --git a/server/logging/logging.go b/server/logging/logging.go index 47bf94da2..400273def 100644 --- a/server/logging/logging.go +++ b/server/logging/logging.go @@ -18,7 +18,7 @@ import ( "context" "errors" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) // ErrNotFound is returned when the log does not exist. diff --git a/server/model/pipeline.go b/server/model/pipeline.go index 10c95bdea..f5af0c80a 100644 --- a/server/model/pipeline.go +++ b/server/model/pipeline.go @@ -16,7 +16,7 @@ package model import ( - "go.woodpecker-ci.org/woodpecker/pipeline/errors" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors" ) type Pipeline struct { diff --git a/server/pipeline/approve.go b/server/pipeline/approve.go index 85a535bb2..275591291 100644 --- a/server/pipeline/approve.go +++ b/server/pipeline/approve.go @@ -20,10 +20,10 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/pipeline/errors" - forge_types "go.woodpecker-ci.org/woodpecker/server/forge/types" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/store" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors" + forge_types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/store" ) // Approve update the status to pending for a blocked pipeline because of a gated repo diff --git a/server/pipeline/cancel.go b/server/pipeline/cancel.go index dbcc6fd82..71df7dd06 100644 --- a/server/pipeline/cancel.go +++ b/server/pipeline/cancel.go @@ -20,10 +20,10 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/server" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/queue" - "go.woodpecker-ci.org/woodpecker/server/store" + "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/queue" + "go.woodpecker-ci.org/woodpecker/v2/server/store" ) // Cancel the pipeline and returns the status. diff --git a/server/pipeline/config.go b/server/pipeline/config.go index 756bc5e88..f592de973 100644 --- a/server/pipeline/config.go +++ b/server/pipeline/config.go @@ -18,10 +18,10 @@ import ( "crypto/sha256" "fmt" - "go.woodpecker-ci.org/woodpecker/pipeline" - forge_types "go.woodpecker-ci.org/woodpecker/server/forge/types" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/store" + "go.woodpecker-ci.org/woodpecker/v2/pipeline" + forge_types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/store" ) func findOrPersistPipelineConfig(store store.Store, currentPipeline *model.Pipeline, forgeYamlConfig *forge_types.FileMeta) (*model.Config, error) { diff --git a/server/pipeline/create.go b/server/pipeline/create.go index 762b888ed..b2c15f0ca 100644 --- a/server/pipeline/create.go +++ b/server/pipeline/create.go @@ -22,11 +22,11 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/pipeline/errors" - "go.woodpecker-ci.org/woodpecker/server" - "go.woodpecker-ci.org/woodpecker/server/forge" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/store" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors" + "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v2/server/forge" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/store" ) var skipPipelineRegex = regexp.MustCompile(`\[(?i:ci *skip|skip *ci)\]`) diff --git a/server/pipeline/decline.go b/server/pipeline/decline.go index 82b368486..7ddadfa5f 100644 --- a/server/pipeline/decline.go +++ b/server/pipeline/decline.go @@ -20,8 +20,8 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/store" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/store" ) // Decline updates the status to declined for blocked pipelines because of a gated repo diff --git a/server/pipeline/gated.go b/server/pipeline/gated.go index 2270d869f..ef424e720 100644 --- a/server/pipeline/gated.go +++ b/server/pipeline/gated.go @@ -14,7 +14,7 @@ package pipeline -import "go.woodpecker-ci.org/woodpecker/server/model" +import "go.woodpecker-ci.org/woodpecker/v2/server/model" func setGatedState(repo *model.Repo, pipeline *model.Pipeline) { // TODO(336): extend gated feature with an allow/block List diff --git a/server/pipeline/helper.go b/server/pipeline/helper.go index 00f873793..497da291d 100644 --- a/server/pipeline/helper.go +++ b/server/pipeline/helper.go @@ -19,8 +19,8 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/server" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func updatePipelineStatus(ctx context.Context, pipeline *model.Pipeline, repo *model.Repo, user *model.User) { diff --git a/server/pipeline/items.go b/server/pipeline/items.go index 94307d028..02026c930 100644 --- a/server/pipeline/items.go +++ b/server/pipeline/items.go @@ -21,13 +21,13 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/pipeline" - pipeline_errors "go.woodpecker-ci.org/woodpecker/pipeline/errors" - "go.woodpecker-ci.org/woodpecker/pipeline/frontend/yaml/compiler" - "go.woodpecker-ci.org/woodpecker/server" - forge_types "go.woodpecker-ci.org/woodpecker/server/forge/types" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/store" + "go.woodpecker-ci.org/woodpecker/v2/pipeline" + pipeline_errors "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/compiler" + "go.woodpecker-ci.org/woodpecker/v2/server" + forge_types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/store" ) func parsePipeline(store store.Store, currentPipeline *model.Pipeline, user *model.User, repo *model.Repo, yamls []*forge_types.FileMeta, envs map[string]string) ([]*pipeline.Item, error) { diff --git a/server/pipeline/items_test.go b/server/pipeline/items_test.go index 340d1b266..3b418eb7a 100644 --- a/server/pipeline/items_test.go +++ b/server/pipeline/items_test.go @@ -3,9 +3,9 @@ package pipeline import ( "testing" - sharedPipeline "go.woodpecker-ci.org/woodpecker/pipeline" - "go.woodpecker-ci.org/woodpecker/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/server/model" + sharedPipeline "go.woodpecker-ci.org/woodpecker/v2/pipeline" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func TestSetPipelineStepsOnPipeline(t *testing.T) { diff --git a/server/pipeline/pipelineStatus.go b/server/pipeline/pipelineStatus.go index 063323a05..2bf94423b 100644 --- a/server/pipeline/pipelineStatus.go +++ b/server/pipeline/pipelineStatus.go @@ -18,8 +18,8 @@ package pipeline import ( "time" - "go.woodpecker-ci.org/woodpecker/pipeline/errors" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func UpdateToStatusRunning(store model.UpdatePipelineStore, pipeline model.Pipeline, started int64) (*model.Pipeline, error) { diff --git a/server/pipeline/pipelineStatus_test.go b/server/pipeline/pipelineStatus_test.go index df0ca6582..a46a831c8 100644 --- a/server/pipeline/pipelineStatus_test.go +++ b/server/pipeline/pipelineStatus_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) type mockUpdatePipelineStore struct{} diff --git a/server/pipeline/queue.go b/server/pipeline/queue.go index 170b4bca0..657355d32 100644 --- a/server/pipeline/queue.go +++ b/server/pipeline/queue.go @@ -19,10 +19,10 @@ import ( "encoding/json" "fmt" - "go.woodpecker-ci.org/woodpecker/pipeline" - "go.woodpecker-ci.org/woodpecker/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/server" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/pipeline" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func queuePipeline(repo *model.Repo, pipelineItems []*pipeline.Item) error { diff --git a/server/pipeline/restart.go b/server/pipeline/restart.go index a47eb33b3..125f40d77 100644 --- a/server/pipeline/restart.go +++ b/server/pipeline/restart.go @@ -22,10 +22,10 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/server" - forge_types "go.woodpecker-ci.org/woodpecker/server/forge/types" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/store" + "go.woodpecker-ci.org/woodpecker/v2/server" + forge_types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/store" ) // Restart a pipeline by creating a new one out of the old and start it diff --git a/server/pipeline/start.go b/server/pipeline/start.go index f43377720..99d1d6a56 100644 --- a/server/pipeline/start.go +++ b/server/pipeline/start.go @@ -19,9 +19,9 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/pipeline" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/store" + "go.woodpecker-ci.org/woodpecker/v2/pipeline" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/store" ) // start a pipeline, make sure it was stored persistent in the store before diff --git a/server/pipeline/stepStatus.go b/server/pipeline/stepStatus.go index d5379c20d..2258b4c22 100644 --- a/server/pipeline/stepStatus.go +++ b/server/pipeline/stepStatus.go @@ -18,8 +18,8 @@ package pipeline import ( "time" - "go.woodpecker-ci.org/woodpecker/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func UpdateStepStatus(store model.UpdateStepStore, step *model.Step, state rpc.State, started int64) error { diff --git a/server/pipeline/stepStatus_test.go b/server/pipeline/stepStatus_test.go index 2747f2504..ffb2a7fa8 100644 --- a/server/pipeline/stepStatus_test.go +++ b/server/pipeline/stepStatus_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) type mockUpdateStepStore struct{} diff --git a/server/pipeline/topic.go b/server/pipeline/topic.go index f4dff2aea..61dd58295 100644 --- a/server/pipeline/topic.go +++ b/server/pipeline/topic.go @@ -18,9 +18,9 @@ import ( "encoding/json" "strconv" - "go.woodpecker-ci.org/woodpecker/server" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/pubsub" + "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/pubsub" ) // publishToTopic publishes message to UI clients diff --git a/server/pipeline/workflowStatus.go b/server/pipeline/workflowStatus.go index c441e7de0..1489dc56d 100644 --- a/server/pipeline/workflowStatus.go +++ b/server/pipeline/workflowStatus.go @@ -15,8 +15,8 @@ package pipeline import ( - "go.woodpecker-ci.org/woodpecker/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func UpdateWorkflowToStatusStarted(store model.UpdateWorkflowStore, workflow model.Workflow, state rpc.State) (*model.Workflow, error) { diff --git a/server/plugins/config/extension.go b/server/plugins/config/extension.go index bf878535f..9b9778af6 100644 --- a/server/plugins/config/extension.go +++ b/server/plugins/config/extension.go @@ -17,8 +17,8 @@ package config import ( "context" - forge_types "go.woodpecker-ci.org/woodpecker/server/forge/types" - "go.woodpecker-ci.org/woodpecker/server/model" + forge_types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) type Extension interface { diff --git a/server/plugins/config/http.go b/server/plugins/config/http.go index 989669b47..ab3e662c2 100644 --- a/server/plugins/config/http.go +++ b/server/plugins/config/http.go @@ -19,9 +19,9 @@ import ( "crypto" "fmt" - forge_types "go.woodpecker-ci.org/woodpecker/server/forge/types" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/plugins/utils" + forge_types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/plugins/utils" ) type http struct { diff --git a/server/plugins/encryption/aes.go b/server/plugins/encryption/aes.go index 0f231220e..a0766f4be 100644 --- a/server/plugins/encryption/aes.go +++ b/server/plugins/encryption/aes.go @@ -21,8 +21,8 @@ import ( "github.com/google/tink/go/subtle/random" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/store" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/store" ) type aesEncryptionService struct { diff --git a/server/plugins/encryption/aes_builder.go b/server/plugins/encryption/aes_builder.go index 8803af4ae..bc0bbe945 100644 --- a/server/plugins/encryption/aes_builder.go +++ b/server/plugins/encryption/aes_builder.go @@ -20,8 +20,8 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/store" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/store" ) type aesConfiguration struct { diff --git a/server/plugins/encryption/aes_encryption.go b/server/plugins/encryption/aes_encryption.go index 8691bc32c..7bf2dae52 100644 --- a/server/plugins/encryption/aes_encryption.go +++ b/server/plugins/encryption/aes_encryption.go @@ -20,7 +20,7 @@ import ( "errors" "fmt" - "go.woodpecker-ci.org/woodpecker/server/store/types" + "go.woodpecker-ci.org/woodpecker/v2/server/store/types" "golang.org/x/crypto/bcrypt" "golang.org/x/crypto/sha3" diff --git a/server/plugins/encryption/encryption.go b/server/plugins/encryption/encryption.go index f0e30db5c..34e9189cd 100644 --- a/server/plugins/encryption/encryption.go +++ b/server/plugins/encryption/encryption.go @@ -19,8 +19,8 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/store" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/store" ) type builder struct { diff --git a/server/plugins/encryption/encryption_builder.go b/server/plugins/encryption/encryption_builder.go index 8b7eecfcc..93b9dff1f 100644 --- a/server/plugins/encryption/encryption_builder.go +++ b/server/plugins/encryption/encryption_builder.go @@ -18,8 +18,8 @@ import ( "errors" "fmt" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/store/types" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/store/types" ) func (b builder) getService(keyType string) (model.EncryptionService, error) { diff --git a/server/plugins/encryption/no_encryption.go b/server/plugins/encryption/no_encryption.go index 08162793d..0d13d5ad4 100644 --- a/server/plugins/encryption/no_encryption.go +++ b/server/plugins/encryption/no_encryption.go @@ -14,7 +14,7 @@ package encryption -import "go.woodpecker-ci.org/woodpecker/server/model" +import "go.woodpecker-ci.org/woodpecker/v2/server/model" type noEncryptionBuilder struct { clients []model.EncryptionClient diff --git a/server/plugins/encryption/tink.go b/server/plugins/encryption/tink.go index c1211b08f..22111b802 100644 --- a/server/plugins/encryption/tink.go +++ b/server/plugins/encryption/tink.go @@ -21,8 +21,8 @@ import ( "github.com/fsnotify/fsnotify" "github.com/google/tink/go/tink" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/store" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/store" ) type tinkEncryptionService struct { diff --git a/server/plugins/encryption/tink_builder.go b/server/plugins/encryption/tink_builder.go index 26ef8204e..a7fba536e 100644 --- a/server/plugins/encryption/tink_builder.go +++ b/server/plugins/encryption/tink_builder.go @@ -20,8 +20,8 @@ import ( "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/store" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/store" ) type tinkConfiguration struct { diff --git a/server/plugins/encryption/tink_keyset.go b/server/plugins/encryption/tink_keyset.go index 82b78f5a7..4218a704e 100644 --- a/server/plugins/encryption/tink_keyset.go +++ b/server/plugins/encryption/tink_keyset.go @@ -25,7 +25,7 @@ import ( "github.com/google/tink/go/keyset" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/server/store/types" + "go.woodpecker-ci.org/woodpecker/v2/server/store/types" ) func (svc *tinkEncryptionService) loadKeyset() error { diff --git a/server/plugins/encryption/wrapper/store/secret_store.go b/server/plugins/encryption/wrapper/store/secret_store.go index cdc35961c..b2ba26a38 100644 --- a/server/plugins/encryption/wrapper/store/secret_store.go +++ b/server/plugins/encryption/wrapper/store/secret_store.go @@ -17,7 +17,7 @@ package store import ( "fmt" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func (wrapper *EncryptedSecretStore) SecretFind(repo *model.Repo, s string) (*model.Secret, error) { diff --git a/server/plugins/encryption/wrapper/store/secret_store_wrapper.go b/server/plugins/encryption/wrapper/store/secret_store_wrapper.go index 006213e70..d1ce549b7 100644 --- a/server/plugins/encryption/wrapper/store/secret_store_wrapper.go +++ b/server/plugins/encryption/wrapper/store/secret_store_wrapper.go @@ -21,7 +21,7 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) type EncryptedSecretStore struct { diff --git a/server/plugins/environments/parse.go b/server/plugins/environments/parse.go index e65d5f87e..09935a5a1 100644 --- a/server/plugins/environments/parse.go +++ b/server/plugins/environments/parse.go @@ -19,7 +19,7 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) type builtin struct { diff --git a/server/plugins/permissions/admin.go b/server/plugins/permissions/admin.go index 1156ddef0..cccad77c8 100644 --- a/server/plugins/permissions/admin.go +++ b/server/plugins/permissions/admin.go @@ -1,8 +1,8 @@ package permissions import ( - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/shared/utils" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/shared/utils" ) func NewAdmins(admins []string) *Admins { diff --git a/server/plugins/permissions/orgs.go b/server/plugins/permissions/orgs.go index b950db9d7..370b6e170 100644 --- a/server/plugins/permissions/orgs.go +++ b/server/plugins/permissions/orgs.go @@ -1,8 +1,8 @@ package permissions import ( - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/shared/utils" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/shared/utils" ) func NewOrgs(orgs []string) *Orgs { diff --git a/server/plugins/permissions/repo_owners.go b/server/plugins/permissions/repo_owners.go index c907d4d9a..2610ce8a3 100644 --- a/server/plugins/permissions/repo_owners.go +++ b/server/plugins/permissions/repo_owners.go @@ -1,8 +1,8 @@ package permissions import ( - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/shared/utils" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/shared/utils" ) func NewOwnersAllowlist(owners []string) *OwnersAllowlist { diff --git a/server/plugins/permissions/repo_owners_test.go b/server/plugins/permissions/repo_owners_test.go index 49d7f2bb8..4ecd36321 100644 --- a/server/plugins/permissions/repo_owners_test.go +++ b/server/plugins/permissions/repo_owners_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func TestOwnersAllowlist(t *testing.T) { diff --git a/server/plugins/registry/combine.go b/server/plugins/registry/combine.go index df7e36113..d4f6c7e45 100644 --- a/server/plugins/registry/combine.go +++ b/server/plugins/registry/combine.go @@ -15,7 +15,7 @@ package registry import ( - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) type combined struct { diff --git a/server/plugins/registry/db.go b/server/plugins/registry/db.go index 37b1d2666..d36b3aa3e 100644 --- a/server/plugins/registry/db.go +++ b/server/plugins/registry/db.go @@ -15,7 +15,7 @@ package registry import ( - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) type db struct { diff --git a/server/plugins/registry/filesystem.go b/server/plugins/registry/filesystem.go index a91b59801..2b889f49d 100644 --- a/server/plugins/registry/filesystem.go +++ b/server/plugins/registry/filesystem.go @@ -24,7 +24,7 @@ import ( "github.com/docker/cli/cli/config/configfile" "github.com/docker/cli/cli/config/types" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) type filesystem struct { diff --git a/server/plugins/secrets/builtin.go b/server/plugins/secrets/builtin.go index c2bcf8956..e19518ce9 100644 --- a/server/plugins/secrets/builtin.go +++ b/server/plugins/secrets/builtin.go @@ -17,7 +17,7 @@ package secrets import ( "context" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) type builtin struct { diff --git a/server/plugins/secrets/builtin_test.go b/server/plugins/secrets/builtin_test.go index 40884fd88..a620a5735 100644 --- a/server/plugins/secrets/builtin_test.go +++ b/server/plugins/secrets/builtin_test.go @@ -20,9 +20,9 @@ import ( "github.com/franela/goblin" "github.com/stretchr/testify/mock" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/plugins/secrets" - mocks_store "go.woodpecker-ci.org/woodpecker/server/store/mocks" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/plugins/secrets" + mocks_store "go.woodpecker-ci.org/woodpecker/v2/server/store/mocks" ) func TestSecretListPipeline(t *testing.T) { diff --git a/server/plugins/utils/http_test.go b/server/plugins/utils/http_test.go index fc50cd65f..4426e82ff 100644 --- a/server/plugins/utils/http_test.go +++ b/server/plugins/utils/http_test.go @@ -24,7 +24,7 @@ import ( "github.com/go-ap/httpsig" "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/server/plugins/utils" + "go.woodpecker-ci.org/woodpecker/v2/server/plugins/utils" ) func TestSign(t *testing.T) { diff --git a/server/queue/fifo.go b/server/queue/fifo.go index feacc1a58..f86c2a866 100644 --- a/server/queue/fifo.go +++ b/server/queue/fifo.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" "github.com/rs/zerolog/log" ) diff --git a/server/queue/fifo_test.go b/server/queue/fifo_test.go index ae73db4bc..e36b417ed 100644 --- a/server/queue/fifo_test.go +++ b/server/queue/fifo_test.go @@ -23,7 +23,7 @@ import ( "time" "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) var noContext = context.Background() diff --git a/server/queue/persistent.go b/server/queue/persistent.go index f04c32e19..fc4b6cf6d 100644 --- a/server/queue/persistent.go +++ b/server/queue/persistent.go @@ -21,7 +21,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) // WithTaskStore returns a queue that is backed by the TaskStore. This diff --git a/server/queue/queue.go b/server/queue/queue.go index 9df78df92..0ecd81181 100644 --- a/server/queue/queue.go +++ b/server/queue/queue.go @@ -19,7 +19,7 @@ import ( "errors" "strings" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) var ( diff --git a/server/router/api.go b/server/router/api.go index 1a0a82e35..95eff6327 100644 --- a/server/router/api.go +++ b/server/router/api.go @@ -20,9 +20,9 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog" - "go.woodpecker-ci.org/woodpecker/server/api" - "go.woodpecker-ci.org/woodpecker/server/api/debug" - "go.woodpecker-ci.org/woodpecker/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v2/server/api" + "go.woodpecker-ci.org/woodpecker/v2/server/api/debug" + "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" ) func apiRoutes(e *gin.RouterGroup) { diff --git a/server/router/middleware/session/agent.go b/server/router/middleware/session/agent.go index e5a021137..3f8dda060 100644 --- a/server/router/middleware/session/agent.go +++ b/server/router/middleware/session/agent.go @@ -18,7 +18,7 @@ package session import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/shared/token" + "go.woodpecker-ci.org/woodpecker/v2/shared/token" ) // AuthorizeAgent authorizes requests from agent to access the queue. diff --git a/server/router/middleware/session/pagination.go b/server/router/middleware/session/pagination.go index 908746ebf..a9021100c 100644 --- a/server/router/middleware/session/pagination.go +++ b/server/router/middleware/session/pagination.go @@ -18,7 +18,7 @@ import ( "strconv" "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) const maxPageSize = 50 diff --git a/server/router/middleware/session/repo.go b/server/router/middleware/session/repo.go index 9fb4a5d19..93366887e 100644 --- a/server/router/middleware/session/repo.go +++ b/server/router/middleware/session/repo.go @@ -23,11 +23,11 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/server" + "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/store" - "go.woodpecker-ci.org/woodpecker/server/store/types" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v2/server/store/types" ) func Repo(c *gin.Context) *model.Repo { diff --git a/server/router/middleware/session/user.go b/server/router/middleware/session/user.go index 036a80ee7..0e40bffff 100644 --- a/server/router/middleware/session/user.go +++ b/server/router/middleware/session/user.go @@ -18,10 +18,10 @@ import ( "net/http" "strconv" - "go.woodpecker-ci.org/woodpecker/server" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/store" - "go.woodpecker-ci.org/woodpecker/shared/token" + "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v2/shared/token" "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" diff --git a/server/router/middleware/store.go b/server/router/middleware/store.go index 5804956fa..e57a604e5 100644 --- a/server/router/middleware/store.go +++ b/server/router/middleware/store.go @@ -18,7 +18,7 @@ import ( "github.com/gin-gonic/gin" "github.com/urfave/cli/v2" - "go.woodpecker-ci.org/woodpecker/server/store" + "go.woodpecker-ci.org/woodpecker/v2/server/store" ) // Store is a middleware function that initializes the Datastore and attaches to diff --git a/server/router/middleware/token/token.go b/server/router/middleware/token/token.go index de6c02c2b..58415954d 100644 --- a/server/router/middleware/token/token.go +++ b/server/router/middleware/token/token.go @@ -17,10 +17,10 @@ package token import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/server" - "go.woodpecker-ci.org/woodpecker/server/forge" - "go.woodpecker-ci.org/woodpecker/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/server/store" + "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v2/server/forge" + "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v2/server/store" ) func Refresh(c *gin.Context) { diff --git a/server/router/middleware/version.go b/server/router/middleware/version.go index 86af18e14..b5c8ec1e2 100644 --- a/server/router/middleware/version.go +++ b/server/router/middleware/version.go @@ -17,7 +17,7 @@ package middleware import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/version" + "go.woodpecker-ci.org/woodpecker/v2/version" ) // Version is a middleware function that appends the Woodpecker version information diff --git a/server/router/router.go b/server/router/router.go index df486dd23..d05a62bc8 100644 --- a/server/router/router.go +++ b/server/router/router.go @@ -23,14 +23,14 @@ import ( swaggerfiles "github.com/swaggo/files" ginSwagger "github.com/swaggo/gin-swagger" - "go.woodpecker-ci.org/woodpecker/cmd/server/docs" - "go.woodpecker-ci.org/woodpecker/server" - "go.woodpecker-ci.org/woodpecker/server/api" - "go.woodpecker-ci.org/woodpecker/server/api/metrics" - "go.woodpecker-ci.org/woodpecker/server/router/middleware/header" - "go.woodpecker-ci.org/woodpecker/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/server/router/middleware/token" - "go.woodpecker-ci.org/woodpecker/server/web" + "go.woodpecker-ci.org/woodpecker/v2/cmd/server/docs" + "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v2/server/api" + "go.woodpecker-ci.org/woodpecker/v2/server/api/metrics" + "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/header" + "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/token" + "go.woodpecker-ci.org/woodpecker/v2/server/web" ) // Load loads the router diff --git a/server/store/datastore/agent.go b/server/store/datastore/agent.go index dcf92dfb4..6c3051d86 100644 --- a/server/store/datastore/agent.go +++ b/server/store/datastore/agent.go @@ -17,7 +17,7 @@ package datastore import ( "errors" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) var ErrNoTokenProvided = errors.New("Please provide a token") diff --git a/server/store/datastore/agent_test.go b/server/store/datastore/agent_test.go index 09662faf2..d314df6f3 100644 --- a/server/store/datastore/agent_test.go +++ b/server/store/datastore/agent_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func TestAgentFindByToken(t *testing.T) { diff --git a/server/store/datastore/config.go b/server/store/datastore/config.go index 5527fbf5e..bae31d668 100644 --- a/server/store/datastore/config.go +++ b/server/store/datastore/config.go @@ -17,7 +17,7 @@ package datastore import ( "xorm.io/builder" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func (s storage) ConfigsForPipeline(pipelineID int64) ([]*model.Config, error) { diff --git a/server/store/datastore/config_test.go b/server/store/datastore/config_test.go index b67804008..32e7d21cb 100644 --- a/server/store/datastore/config_test.go +++ b/server/store/datastore/config_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func TestConfig(t *testing.T) { diff --git a/server/store/datastore/cron.go b/server/store/datastore/cron.go index 989b4698c..ed3e23f9b 100644 --- a/server/store/datastore/cron.go +++ b/server/store/datastore/cron.go @@ -15,7 +15,7 @@ package datastore import ( - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" "xorm.io/builder" ) diff --git a/server/store/datastore/cron_test.go b/server/store/datastore/cron_test.go index 996728ce4..3f5eaa7a1 100644 --- a/server/store/datastore/cron_test.go +++ b/server/store/datastore/cron_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func TestCronCreate(t *testing.T) { diff --git a/server/store/datastore/engine.go b/server/store/datastore/engine.go index e996471a3..fb5a5c082 100644 --- a/server/store/datastore/engine.go +++ b/server/store/datastore/engine.go @@ -17,8 +17,8 @@ package datastore import ( "github.com/rs/zerolog" - "go.woodpecker-ci.org/woodpecker/server/store" - "go.woodpecker-ci.org/woodpecker/server/store/datastore/migration" + "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v2/server/store/datastore/migration" "xorm.io/xorm" xlog "xorm.io/xorm/log" diff --git a/server/store/datastore/errors.go b/server/store/datastore/errors.go index e49f11f8a..a7d89388a 100644 --- a/server/store/datastore/errors.go +++ b/server/store/datastore/errors.go @@ -17,7 +17,7 @@ package datastore import ( "fmt" - "go.woodpecker-ci.org/woodpecker/server/store/types" + "go.woodpecker-ci.org/woodpecker/v2/server/store/types" ) type ErrorRepoNotExist struct { diff --git a/server/store/datastore/feed.go b/server/store/datastore/feed.go index 72508c514..5ce768d9f 100644 --- a/server/store/datastore/feed.go +++ b/server/store/datastore/feed.go @@ -17,7 +17,7 @@ package datastore import ( "xorm.io/builder" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) var feedItemSelect = `repos.repo_id as feed_repo_id, diff --git a/server/store/datastore/feed_test.go b/server/store/datastore/feed_test.go index 697636f74..333c68b3a 100644 --- a/server/store/datastore/feed_test.go +++ b/server/store/datastore/feed_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func TestGetPipelineQueue(t *testing.T) { diff --git a/server/store/datastore/helper.go b/server/store/datastore/helper.go index 3bd73de3e..0b3e5dca1 100644 --- a/server/store/datastore/helper.go +++ b/server/store/datastore/helper.go @@ -21,8 +21,8 @@ import ( "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/store/types" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/store/types" ) // wrapGet return error if err not nil or if requested entry do not exist diff --git a/server/store/datastore/helper_test.go b/server/store/datastore/helper_test.go index b7a096701..7beff99f3 100644 --- a/server/store/datastore/helper_test.go +++ b/server/store/datastore/helper_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/server/store/types" + "go.woodpecker-ci.org/woodpecker/v2/server/store/types" ) func TestWrapGet(t *testing.T) { diff --git a/server/store/datastore/log.go b/server/store/datastore/log.go index ad7e562d2..7ca187b8e 100644 --- a/server/store/datastore/log.go +++ b/server/store/datastore/log.go @@ -17,7 +17,7 @@ package datastore import ( "fmt" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func (s storage) LogFind(step *model.Step) ([]*model.LogEntry, error) { diff --git a/server/store/datastore/log_test.go b/server/store/datastore/log_test.go index 6ee424b35..1aa02d285 100644 --- a/server/store/datastore/log_test.go +++ b/server/store/datastore/log_test.go @@ -18,7 +18,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func TestLogCreateFindDelete(t *testing.T) { diff --git a/server/store/datastore/migration/004_fix_pr_secret_event_name.go b/server/store/datastore/migration/004_fix_pr_secret_event_name.go index 3ec8a464d..66406a07b 100644 --- a/server/store/datastore/migration/004_fix_pr_secret_event_name.go +++ b/server/store/datastore/migration/004_fix_pr_secret_event_name.go @@ -18,7 +18,7 @@ import ( "src.techknowlogick.com/xormigrate" "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) var fixPRSecretEventName = xormigrate.Migration{ diff --git a/server/store/datastore/migration/009_recreate_agents_table.go b/server/store/datastore/migration/009_recreate_agents_table.go index 32d5b4d31..b0a8d1f60 100644 --- a/server/store/datastore/migration/009_recreate_agents_table.go +++ b/server/store/datastore/migration/009_recreate_agents_table.go @@ -18,7 +18,7 @@ import ( "src.techknowlogick.com/xormigrate" "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) var recreateAgentsTable = xormigrate.Migration{ diff --git a/server/store/datastore/migration/020_alter_logs_table.go b/server/store/datastore/migration/020_alter_logs_table.go index 431e5a18c..e4cca5e8e 100644 --- a/server/store/datastore/migration/020_alter_logs_table.go +++ b/server/store/datastore/migration/020_alter_logs_table.go @@ -25,7 +25,7 @@ import ( "src.techknowlogick.com/xormigrate" "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/shared/utils" + "go.woodpecker-ci.org/woodpecker/v2/shared/utils" ) // perPage020 sets the size of the slice to read per page diff --git a/server/store/datastore/migration/021_parent_steps_to_workflows.go b/server/store/datastore/migration/021_parent_steps_to_workflows.go index ac0325e8b..a9831a19e 100644 --- a/server/store/datastore/migration/021_parent_steps_to_workflows.go +++ b/server/store/datastore/migration/021_parent_steps_to_workflows.go @@ -18,7 +18,7 @@ import ( "src.techknowlogick.com/xormigrate" "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) type oldStep021 struct { diff --git a/server/store/datastore/migration/022_add_orgs.go b/server/store/datastore/migration/022_add_orgs.go index 8f56eb93f..0d8968903 100644 --- a/server/store/datastore/migration/022_add_orgs.go +++ b/server/store/datastore/migration/022_add_orgs.go @@ -22,7 +22,7 @@ import ( "xorm.io/builder" "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) type oldSecret022 struct { diff --git a/server/store/datastore/migration/023_add_org_id.go b/server/store/datastore/migration/023_add_org_id.go index c9e49f4b9..da055421b 100644 --- a/server/store/datastore/migration/023_add_org_id.go +++ b/server/store/datastore/migration/023_add_org_id.go @@ -20,7 +20,7 @@ import ( "src.techknowlogick.com/xormigrate" "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) var addOrgID = xormigrate.Migration{ diff --git a/server/store/datastore/migration/027_convert_to_new_pipeline_errors_format.go b/server/store/datastore/migration/027_convert_to_new_pipeline_errors_format.go index 8d3cc05d9..de6bc229f 100644 --- a/server/store/datastore/migration/027_convert_to_new_pipeline_errors_format.go +++ b/server/store/datastore/migration/027_convert_to_new_pipeline_errors_format.go @@ -18,7 +18,7 @@ import ( "src.techknowlogick.com/xormigrate" "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/pipeline/errors" + "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors" ) // perPage027 set the size of the slice to read per page diff --git a/server/store/datastore/migration/migration.go b/server/store/datastore/migration/migration.go index a56168623..218f7e404 100644 --- a/server/store/datastore/migration/migration.go +++ b/server/store/datastore/migration/migration.go @@ -21,7 +21,7 @@ import ( "src.techknowlogick.com/xormigrate" "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) // APPEND NEW MIGRATIONS diff --git a/server/store/datastore/org.go b/server/store/datastore/org.go index 411f5fccb..a6a1b37cd 100644 --- a/server/store/datastore/org.go +++ b/server/store/datastore/org.go @@ -19,7 +19,7 @@ import ( "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func (s storage) OrgCreate(org *model.Org) error { diff --git a/server/store/datastore/org_test.go b/server/store/datastore/org_test.go index 1ff5391d6..8e44bee5a 100644 --- a/server/store/datastore/org_test.go +++ b/server/store/datastore/org_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func TestOrgCRUD(t *testing.T) { diff --git a/server/store/datastore/permission.go b/server/store/datastore/permission.go index 6949308d7..fdfa1369e 100644 --- a/server/store/datastore/permission.go +++ b/server/store/datastore/permission.go @@ -20,7 +20,7 @@ import ( "xorm.io/builder" "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func (s storage) PermFind(user *model.User, repo *model.Repo) (*model.Perm, error) { diff --git a/server/store/datastore/permission_test.go b/server/store/datastore/permission_test.go index 2f354a661..924124c58 100644 --- a/server/store/datastore/permission_test.go +++ b/server/store/datastore/permission_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func TestPermFind(t *testing.T) { diff --git a/server/store/datastore/pipeline.go b/server/store/datastore/pipeline.go index 295ab9c21..7e6d2375a 100644 --- a/server/store/datastore/pipeline.go +++ b/server/store/datastore/pipeline.go @@ -20,7 +20,7 @@ import ( "xorm.io/builder" "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func (s storage) GetPipeline(id int64) (*model.Pipeline, error) { diff --git a/server/store/datastore/pipeline_test.go b/server/store/datastore/pipeline_test.go index 9913cbd9d..d478e9137 100644 --- a/server/store/datastore/pipeline_test.go +++ b/server/store/datastore/pipeline_test.go @@ -22,7 +22,7 @@ import ( "github.com/franela/goblin" "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func TestPipelines(t *testing.T) { diff --git a/server/store/datastore/redirection.go b/server/store/datastore/redirection.go index cf5318593..1c966f964 100644 --- a/server/store/datastore/redirection.go +++ b/server/store/datastore/redirection.go @@ -18,7 +18,7 @@ import ( "xorm.io/builder" "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func (s storage) GetRedirection(fullName string) (*model.Redirection, error) { diff --git a/server/store/datastore/redirection_test.go b/server/store/datastore/redirection_test.go index a1f4f6753..2fc4c53d1 100644 --- a/server/store/datastore/redirection_test.go +++ b/server/store/datastore/redirection_test.go @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/store/types" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/store/types" ) func TestGetRedirection(t *testing.T) { diff --git a/server/store/datastore/registry.go b/server/store/datastore/registry.go index c24af7776..782d98c4d 100644 --- a/server/store/datastore/registry.go +++ b/server/store/datastore/registry.go @@ -17,7 +17,7 @@ package datastore import ( "xorm.io/builder" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func (s storage) RegistryFind(repo *model.Repo, addr string) (*model.Registry, error) { diff --git a/server/store/datastore/registry_test.go b/server/store/datastore/registry_test.go index b5aeb764e..06c84259b 100644 --- a/server/store/datastore/registry_test.go +++ b/server/store/datastore/registry_test.go @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/store/types" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/store/types" ) func TestRegistryFind(t *testing.T) { diff --git a/server/store/datastore/repo.go b/server/store/datastore/repo.go index ad7fa3da1..37ba93220 100644 --- a/server/store/datastore/repo.go +++ b/server/store/datastore/repo.go @@ -21,8 +21,8 @@ import ( "xorm.io/builder" "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/store/types" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/store/types" ) func (s storage) GetRepo(id int64) (*model.Repo, error) { diff --git a/server/store/datastore/repo_test.go b/server/store/datastore/repo_test.go index 126e32ec2..02dd66ea8 100644 --- a/server/store/datastore/repo_test.go +++ b/server/store/datastore/repo_test.go @@ -21,7 +21,7 @@ import ( "github.com/franela/goblin" "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func TestRepos(t *testing.T) { diff --git a/server/store/datastore/secret.go b/server/store/datastore/secret.go index 79ca6df94..85100e49a 100644 --- a/server/store/datastore/secret.go +++ b/server/store/datastore/secret.go @@ -17,7 +17,7 @@ package datastore import ( "xorm.io/builder" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) const orderSecretsBy = "secret_name" diff --git a/server/store/datastore/secret_test.go b/server/store/datastore/secret_test.go index f18bd4a64..917f75c4e 100644 --- a/server/store/datastore/secret_test.go +++ b/server/store/datastore/secret_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func TestSecretFind(t *testing.T) { diff --git a/server/store/datastore/server_config.go b/server/store/datastore/server_config.go index 238e81060..2dd52f406 100644 --- a/server/store/datastore/server_config.go +++ b/server/store/datastore/server_config.go @@ -14,7 +14,7 @@ package datastore -import "go.woodpecker-ci.org/woodpecker/server/model" +import "go.woodpecker-ci.org/woodpecker/v2/server/model" func (s storage) ServerConfigGet(key string) (string, error) { config := new(model.ServerConfig) diff --git a/server/store/datastore/server_config_test.go b/server/store/datastore/server_config_test.go index 04757d060..ac13d1c14 100644 --- a/server/store/datastore/server_config_test.go +++ b/server/store/datastore/server_config_test.go @@ -17,7 +17,7 @@ package datastore import ( "testing" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func TestServerConfigGetSet(t *testing.T) { diff --git a/server/store/datastore/step.go b/server/store/datastore/step.go index f79c3866a..f7739f4ad 100644 --- a/server/store/datastore/step.go +++ b/server/store/datastore/step.go @@ -18,7 +18,7 @@ import ( "xorm.io/builder" "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func (s storage) StepLoad(id int64) (*model.Step, error) { diff --git a/server/store/datastore/step_test.go b/server/store/datastore/step_test.go index 65493b006..5238ab415 100644 --- a/server/store/datastore/step_test.go +++ b/server/store/datastore/step_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/server/model" - "go.woodpecker-ci.org/woodpecker/server/store/types" + "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/store/types" ) func TestStepFind(t *testing.T) { diff --git a/server/store/datastore/task.go b/server/store/datastore/task.go index b29808c34..67e8d9797 100644 --- a/server/store/datastore/task.go +++ b/server/store/datastore/task.go @@ -15,7 +15,7 @@ package datastore import ( - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func (s storage) TaskList() ([]*model.Task, error) { diff --git a/server/store/datastore/task_test.go b/server/store/datastore/task_test.go index 7434aef8d..ff93f42b5 100644 --- a/server/store/datastore/task_test.go +++ b/server/store/datastore/task_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func TestTaskList(t *testing.T) { diff --git a/server/store/datastore/user.go b/server/store/datastore/user.go index 739337137..39f09af75 100644 --- a/server/store/datastore/user.go +++ b/server/store/datastore/user.go @@ -17,7 +17,7 @@ package datastore import ( "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func (s storage) GetUser(id int64) (*model.User, error) { diff --git a/server/store/datastore/users_test.go b/server/store/datastore/users_test.go index fe4176759..de6de5820 100644 --- a/server/store/datastore/users_test.go +++ b/server/store/datastore/users_test.go @@ -20,7 +20,7 @@ import ( "github.com/franela/goblin" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func TestUsers(t *testing.T) { diff --git a/server/store/datastore/workflow.go b/server/store/datastore/workflow.go index 708d6d0f6..216b065dc 100644 --- a/server/store/datastore/workflow.go +++ b/server/store/datastore/workflow.go @@ -17,7 +17,7 @@ package datastore import ( "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func (s storage) WorkflowGetTree(pipeline *model.Pipeline) ([]*model.Workflow, error) { diff --git a/server/store/datastore/workflow_test.go b/server/store/datastore/workflow_test.go index a12aa7100..57af85f2d 100644 --- a/server/store/datastore/workflow_test.go +++ b/server/store/datastore/workflow_test.go @@ -18,7 +18,7 @@ package datastore import ( "testing" - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) func TestWorkflowLoad(t *testing.T) { diff --git a/server/store/mocks/store.go b/server/store/mocks/store.go index d40b3947c..ab9d24189 100644 --- a/server/store/mocks/store.go +++ b/server/store/mocks/store.go @@ -4,7 +4,7 @@ package mocks import ( mock "github.com/stretchr/testify/mock" - model "go.woodpecker-ci.org/woodpecker/server/model" + model "go.woodpecker-ci.org/woodpecker/v2/server/model" ) // Store is an autogenerated mock type for the Store type diff --git a/server/store/store.go b/server/store/store.go index 9e8b87fa5..2806ff95e 100644 --- a/server/store/store.go +++ b/server/store/store.go @@ -18,7 +18,7 @@ package store //go:generate mockery --name Store --output mocks --case underscore import ( - "go.woodpecker-ci.org/woodpecker/server/model" + "go.woodpecker-ci.org/woodpecker/v2/server/model" ) // TODO: CreateX func should return new object to not indirect let storage change an existing object (alter ID etc...) diff --git a/server/web/config.go b/server/web/config.go index dfa2628cb..4344dea7f 100644 --- a/server/web/config.go +++ b/server/web/config.go @@ -22,10 +22,10 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/server" - "go.woodpecker-ci.org/woodpecker/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/shared/token" - "go.woodpecker-ci.org/woodpecker/version" + "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v2/shared/token" + "go.woodpecker-ci.org/woodpecker/v2/version" ) func Config(c *gin.Context) { diff --git a/server/web/web.go b/server/web/web.go index 05571a73d..2397c02ed 100644 --- a/server/web/web.go +++ b/server/web/web.go @@ -28,8 +28,8 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/server" - "go.woodpecker-ci.org/woodpecker/web" + "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v2/web" ) // etag is an identifier for a resource version diff --git a/server/web/web_test.go b/server/web/web_test.go index 9aefd005c..e09df0e71 100644 --- a/server/web/web_test.go +++ b/server/web/web_test.go @@ -22,7 +22,7 @@ import ( "github.com/gin-gonic/gin" "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/server" + "go.woodpecker-ci.org/woodpecker/v2/server" ) func Test_custom_file_returns_OK_and_empty_content_and_fitting_mimetype(t *testing.T) { diff --git a/woodpecker-go/README.md b/woodpecker-go/README.md index 02b56d6a6..98ab329dc 100644 --- a/woodpecker-go/README.md +++ b/woodpecker-go/README.md @@ -2,7 +2,7 @@ ```Go import ( - "go.woodpecker-ci.org/woodpecker/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" "golang.org/x/oauth2" )