Skip to content

Commit

Permalink
Update go module path for major version 2 (#2905)
Browse files Browse the repository at this point in the history
https://go.dev/doc/modules/release-workflow#breaking

Fixes #2913 fixes
#2654
```
runephilosof@fedora:~/code/platform-woodpecker/woodpecker-repo-configurator (master)$ go get go.woodpecker-ci.org/woodpecker@v2.0.0
go: go.woodpecker-ci.org/woodpecker@v2.0.0: invalid version: module contains a go.mod file, so module path must match major version ("go.woodpecker-ci.org/woodpecker/v2")
```

---------

Co-authored-by: qwerty287 <80460567+qwerty287@users.noreply.github.com>
  • Loading branch information
runephilosof-karnovgroup and qwerty287 authored Dec 8, 2023
1 parent 87fcad4 commit adb2c82
Show file tree
Hide file tree
Showing 295 changed files with 755 additions and 755 deletions.
4 changes: 2 additions & 2 deletions .gitpod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion .woodpecker/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
46 changes: 23 additions & 23 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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" )
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions agent/logger.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion agent/rpc/auth_client_grpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
6 changes: 3 additions & 3 deletions agent/rpc/client_grpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions agent/runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions agent/tracer.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion cli/common/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion cli/common/pipeline.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion cli/common/zerologger.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion cli/cron/cron.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions cli/cron/cron_add.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
4 changes: 2 additions & 2 deletions cli/cron/cron_info.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
4 changes: 2 additions & 2 deletions cli/cron/cron_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
4 changes: 2 additions & 2 deletions cli/cron/cron_rm.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
6 changes: 3 additions & 3 deletions cli/cron/cron_update.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
6 changes: 3 additions & 3 deletions cli/deploy/deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
26 changes: 13 additions & 13 deletions cli/exec/exec.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion cli/exec/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion cli/exec/line.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions cli/exec/metadata.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions cli/info/info.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion cli/internal/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions cli/lint/lint.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading

0 comments on commit adb2c82

Please sign in to comment.