Merge pull request #202 from woodpecker-ci/org-change

Org change

.cli.sh

@@ -6,11 +6,11 @@ set -x
 export CGO_ENABLED=0
 
 # compile for all architectures
-GOOS=linux   GOARCH=amd64 go build -ldflags "-X main.version=${DRONE_TAG##v}" -o cli/release/linux/amd64/woodpecker   github.com/laszlocph/woodpecker/cli/drone
-GOOS=linux   GOARCH=arm64 go build -ldflags "-X main.version=${DRONE_TAG##v}" -o cli/release/linux/arm64/woodpecker   github.com/laszlocph/woodpecker/cli/drone
-GOOS=linux   GOARCH=arm   go build -ldflags "-X main.version=${DRONE_TAG##v}" -o cli/release/linux/arm/woodpecker     github.com/laszlocph/woodpecker/cli/drone
-GOOS=windows GOARCH=amd64 go build -ldflags "-X main.version=${DRONE_TAG##v}" -o cli/release/windows/amd64/woodpecker github.com/laszlocph/woodpecker/cli/drone
-GOOS=darwin  GOARCH=amd64 go build -ldflags "-X main.version=${DRONE_TAG##v}" -o cli/release/darwin/amd64/woodpecker  github.com/laszlocph/woodpecker/cli/drone
+GOOS=linux   GOARCH=amd64 go build -ldflags "-X main.version=${DRONE_TAG##v}" -o cli/release/linux/amd64/woodpecker   github.com/woodpecker-ci/woodpecker/cli/drone
+GOOS=linux   GOARCH=arm64 go build -ldflags "-X main.version=${DRONE_TAG##v}" -o cli/release/linux/arm64/woodpecker   github.com/woodpecker-ci/woodpecker/cli/drone
+GOOS=linux   GOARCH=arm   go build -ldflags "-X main.version=${DRONE_TAG##v}" -o cli/release/linux/arm/woodpecker     github.com/woodpecker-ci/woodpecker/cli/drone
+GOOS=windows GOARCH=amd64 go build -ldflags "-X main.version=${DRONE_TAG##v}" -o cli/release/windows/amd64/woodpecker github.com/woodpecker-ci/woodpecker/cli/drone
+GOOS=darwin  GOARCH=amd64 go build -ldflags "-X main.version=${DRONE_TAG##v}" -o cli/release/darwin/amd64/woodpecker  github.com/woodpecker-ci/woodpecker/cli/drone
 
 # tar binary files prior to upload
 tar -cvzf cli/release/woodpecker_linux_amd64.tar.gz   -C cli/release/linux/amd64   woodpecker

.drone.sh

@@ -11,5 +11,5 @@ fi
 
 echo "Building $VERSION"
 
-go build -ldflags '-extldflags "-static" -X github.com/laszlocph/woodpecker/version.Version='${VERSION} -o release/drone-server github.com/laszlocph/woodpecker/cmd/drone-server
-GOOS=linux GOARCH=amd64 CGO_ENABLED=0         go build -ldflags '-X github.com/laszlocph/woodpecker/version.Version='${VERSION} -o release/drone-agent             github.com/laszlocph/woodpecker/cmd/drone-agent
+go build -ldflags '-extldflags "-static" -X github.com/woodpecker-ci/woodpecker/version.Version='${VERSION} -o release/drone-server github.com/woodpecker-ci/woodpecker/cmd/drone-server
+GOOS=linux GOARCH=amd64 CGO_ENABLED=0         go build -ldflags '-X github.com/woodpecker-ci/woodpecker/version.Version='${VERSION} -o release/drone-agent             github.com/woodpecker-ci/woodpecker/cmd/drone-agent

.drone.yml

@@ -26,7 +26,7 @@ pipeline:
       - DATABASE_DRIVER=postgres
       - DATABASE_CONFIG=host=postgres user=postgres dbname=postgres sslmode=disable
     commands:
-      - go test -timeout 30s github.com/laszlocph/woodpecker/store/datastore
+      - go test -timeout 30s github.com/woodpecker-ci/woodpecker/store/datastore
 
   test-mysql:
     image: golang:1.16
@@ -35,7 +35,7 @@ pipeline:
       - DATABASE_DRIVER=mysql
       - DATABASE_CONFIG=root@tcp(mysql:3306)/test?parseTime=true
     commands:
-      - go test -timeout 30s github.com/laszlocph/woodpecker/store/datastore
+      - go test -timeout 30s github.com/woodpecker-ci/woodpecker/store/datastore
 
   build-frontend:
     image: node:10.17.0-stretch
@@ -45,15 +45,15 @@ pipeline:
   build:
     image: golang:1.16
     commands:
-      - go get github.com/laszlocph/togo
+      - go get github.com/woodpecker-ci/togo
       - (cd web/; go generate ./...)
       - ./.drone.sh
     when:
       event: [ push, tag ]
 
   # publish-server-alpine:
   #   image: plugins/docker
-  #   repo: laszlocloud/woodpecker-server
+  #   repo: woodpeckerci/woodpecker-server
   #   dockerfile: Dockerfile.alpine
   #   secrets: [ docker_username, docker_password ]
   #   tag: [ alpine ]
@@ -67,7 +67,7 @@ pipeline:
 
   publish-server:
     image: plugins/docker
-    repo: laszlocloud/woodpecker-server
+    repo: woodpeckerci/woodpecker-server
     secrets: [ docker_username, docker_password ]
     tag: [ latest ]
     when:
@@ -76,7 +76,7 @@ pipeline:
 
   publish-agent:
     image: plugins/docker
-    repo: laszlocloud/woodpecker-agent
+    repo: woodpeckerci/woodpecker-agent
     dockerfile: Dockerfile.agent
     secrets: [ docker_username, docker_password ]
     tag: [ latest ]
@@ -86,7 +86,7 @@ pipeline:
 
   # publish-agent-alpine:
   #   image: plugins/docker
-  #   repo: laszlocloud/woodpecker-agent
+  #   repo: woodpeckerci/woodpecker-agent
   #   dockerfile: Dockerfile.agent.alpine
   #   secrets: [ docker_username, docker_password ]
   #   tag: [ alpine ]
@@ -96,7 +96,7 @@ pipeline:
 
 #  release-server-alpine:
 #    image: plugins/docker
-#    repo: laszlocloud/woodpecker-server
+#    repo: woodpeckerci/woodpecker-server
 #    dockerfile: Dockerfile.alpine
 #    secrets: [ docker_username, docker_password ]
 #    tag: "${DRONE_TAG}-alpine"
@@ -105,7 +105,7 @@ pipeline:
 #
 #  release-agent-alpine:
 #    image: plugins/docker
-#    repo: laszlocloud/woodpecker-agent
+#    repo: woodpeckerci/woodpecker-agent
 #    dockerfile: Dockerfile.agent.alpine
 #    secrets: [ docker_username, docker_password ]
 #    tag: "${DRONE_TAG}-alpine"
@@ -114,15 +114,15 @@ pipeline:
 
   release-server:
     image: plugins/docker
-    repo: laszlocloud/woodpecker-server
+    repo: woodpeckerci/woodpecker-server
     secrets: [ docker_username, docker_password ]
     tag: ${DRONE_TAG}
     when:
       event: tag
 
   release-agent:
     image: plugins/docker
-    repo: laszlocloud/woodpecker-agent
+    repo: woodpeckerci/woodpecker-agent
     dockerfile: Dockerfile.agent
     secrets: [ docker_username, docker_password ]
     tag: ${DRONE_TAG}

BUILDING

@@ -14,7 +14,7 @@ curl -o swagger -L'#' "$download_url"
 chmod +x swagger
 sudo mv swagger /usr/local/bin
 
-go get github.com/laszlocph/togo
+go get github.com/woodpecker-ci/togo
 
 go generate
 

Makefile

@@ -22,28 +22,28 @@ format:
 	@gofmt -w ${GOFILES_NOVENDOR}
 
 test-agent:
-	$(DOCKER_RUN) go test -race -timeout 30s github.com/laszlocph/woodpecker/cmd/drone-agent $(go list ./... | grep -v /vendor/)
+	$(DOCKER_RUN) go test -race -timeout 30s github.com/woodpecker-ci/woodpecker/cmd/drone-agent $(go list ./... | grep -v /vendor/)
 
 test-server:
-	$(DOCKER_RUN) go test -race -timeout 30s github.com/laszlocph/woodpecker/cmd/drone-server
+	$(DOCKER_RUN) go test -race -timeout 30s github.com/woodpecker-ci/woodpecker/cmd/drone-server
 
 test-frontend:
 		(cd web/; yarn run test)
 
 test-lib:
-	go get github.com/laszlocph/woodpecker/cncd/pipeline/pipec
-	go get github.com/laszlocph/woodpecker/remote/mock
-	go get github.com/laszlocph/woodpecker/cli/drone/internal
-	go get -t github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/frontend/yaml
+	go get github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipec
+	go get github.com/woodpecker-ci/woodpecker/remote/mock
+	go get github.com/woodpecker-ci/woodpecker/cli/drone/internal
+	go get -t github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml
 	$(DOCKER_RUN) go test -race -timeout 30s $(shell go list ./... | grep -v '/cmd/')
 
 test: test-lib test-agent test-server
 
 build-agent:
-	$(DOCKER_RUN) go build -o build/drone-agent github.com/laszlocph/woodpecker/cmd/drone-agent
+	$(DOCKER_RUN) go build -o build/drone-agent github.com/woodpecker-ci/woodpecker/cmd/drone-agent
 
 build-server:
-	$(DOCKER_RUN) go build -o build/drone-server github.com/laszlocph/woodpecker/cmd/drone-server
+	$(DOCKER_RUN) go build -o build/drone-server github.com/woodpecker-ci/woodpecker/cmd/drone-server
 
 build-frontend:
 	(cd web/; yarn run build)
@@ -52,5 +52,5 @@ build-frontend:
 build: build-agent build-server
 
 install:
-	go install github.com/laszlocph/woodpecker/cmd/drone-agent
-	go install github.com/laszlocph/woodpecker/cmd/drone-server
+	go install github.com/woodpecker-ci/woodpecker/cmd/drone-agent
+	go install github.com/woodpecker-ci/woodpecker/cmd/drone-server

README.md

@@ -5,7 +5,7 @@ A fork of the Drone CI system.
 - Based on the v0.8 code tree
 - Fully Apache 2.0, no tiers
 
-[![Go Report Card](https://goreportcard.com/badge/github.com/laszlocph/woodpecker)](https://goreportcard.com/report/github.com/laszlocph/woodpecker) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![https://discord.gg/fcMQqSMXJy](https://img.shields.io/discord/838698813463724034.svg)](https://discord.gg/fcMQqSMXJy)
+[![Go Report Card](https://goreportcard.com/badge/github.com/woodpecker-ci/woodpecker)](https://goreportcard.com/report/github.com/woodpecker-ci/woodpecker) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![https://discord.gg/fcMQqSMXJy](https://img.shields.io/discord/838698813463724034.svg)](https://discord.gg/fcMQqSMXJy)
 
 ![woodpecker](docs/docs/images/woodpecker.png)
 
@@ -95,7 +95,7 @@ https://woodpecker.laszlo.cloud
 
 Currently, I know of one organization using this fork. With 50+ users, 130+ repos and more than 1100 builds a week.
 
-Leave a note here if you are using it: https://github.com/laszlocph/woodpecker/issues/122
+Leave a note here if you are using it: https://github.com/woodpecker-ci/woodpecker/issues/122
 
 ## License
 

charts/woodpecker-agent/Chart.yaml

@@ -11,7 +11,7 @@ keywords:
 - docker
 - go
 sources:
-- https://github.com/laszlocph/woodpecker
+- https://github.com/woodpecker-ci/woodpecker
 maintainers:
 - name: Laszlo Fogas
   email: laszlo@laszlo.cloud

charts/woodpecker-server/Chart.yaml

@@ -11,7 +11,7 @@ keywords:
 - docker
 - go
 sources:
-- https://github.com/laszlocph/woodpecker
+- https://github.com/woodpecker-ci/woodpecker
 maintainers:
 - name: Laszlo Fogas
   email: laszlo@laszlo.cloud

cli/drone/build/build_approve.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 	"github.com/urfave/cli"
 )
 

cli/drone/build/build_decline.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 	"github.com/urfave/cli"
 )
 

cli/drone/build/build_info.go

@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"text/template"
 
-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 	"github.com/urfave/cli"
 )
 

cli/drone/build/build_kill.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 	"github.com/urfave/cli"
 )
 

cli/drone/build/build_last.go

@@ -4,7 +4,7 @@ import (
 	"os"
 	"text/template"
 
-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 	"github.com/urfave/cli"
 )
 

cli/drone/build/build_list.go

@@ -4,7 +4,7 @@ import (
 	"os"
 	"text/template"
 
-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 	"github.com/urfave/cli"
 )
 

cli/drone/build/build_ps.go

@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"text/template"
 
-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 	"github.com/urfave/cli"
 )
 

cli/drone/build/build_queue.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"text/template"
 
-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 	"github.com/urfave/cli"
 )
 

cli/drone/build/build_start.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 	"github.com/urfave/cli"
 )
 

cli/drone/build/build_stop.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 	"github.com/urfave/cli"
 )
 

cli/drone/deploy/deploy.go

@@ -6,8 +6,8 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/laszlocph/woodpecker/cli/drone/internal"
-	"github.com/laszlocph/woodpecker/drone-go/drone"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/drone-go/drone"
 
 	"github.com/urfave/cli"
 )

cli/drone/exec/exec.go

@@ -14,16 +14,16 @@ import (
 	"time"
 
 	"github.com/drone/envsubst"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/backend"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/backend/docker"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/frontend"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/frontend/yaml"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/frontend/yaml/compiler"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/frontend/yaml/linter"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/frontend/yaml/matrix"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/interrupt"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/multipart"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend/docker"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml/compiler"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml/linter"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml/matrix"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/interrupt"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/multipart"
 
 	"github.com/urfave/cli"
 )

cli/drone/info/info.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/urfave/cli"
 
-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 )
 
 // Command exports the info command.

cli/drone/internal/util.go

@@ -11,7 +11,7 @@ import (
 	"golang.org/x/net/proxy"
 	"golang.org/x/oauth2"
 
-	"github.com/laszlocph/woodpecker/drone-go/drone"
+	"github.com/woodpecker-ci/woodpecker/drone-go/drone"
 )
 
 // NewClient returns a new client from the CLI context.

cli/drone/log/log_purge.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 	"github.com/urfave/cli"
 )
 

cli/drone/main.go

@@ -4,15 +4,15 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/laszlocph/woodpecker/cli/drone/build"
-	"github.com/laszlocph/woodpecker/cli/drone/deploy"
-	"github.com/laszlocph/woodpecker/cli/drone/exec"
-	"github.com/laszlocph/woodpecker/cli/drone/info"
-	"github.com/laszlocph/woodpecker/cli/drone/log"
-	"github.com/laszlocph/woodpecker/cli/drone/registry"
-	"github.com/laszlocph/woodpecker/cli/drone/repo"
-	"github.com/laszlocph/woodpecker/cli/drone/secret"
-	"github.com/laszlocph/woodpecker/cli/drone/user"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/build"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/deploy"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/exec"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/info"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/log"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/registry"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/repo"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/secret"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/user"
 
 	_ "github.com/joho/godotenv/autoload"
 	"github.com/urfave/cli"