Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Org change #202

Merged
merged 2 commits into from May 25, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions .cli.sh
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .drone.sh
Expand Up @@ -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
22 changes: 11 additions & 11 deletions .drone.yml
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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 ]
Expand All @@ -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:
Expand All @@ -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 ]
Expand All @@ -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 ]
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion BUILDING
Expand Up @@ -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

20 changes: 10 additions & 10 deletions Makefile
Expand Up @@ -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)
Expand All @@ -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
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -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)

Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion charts/woodpecker-agent/Chart.yaml
Expand Up @@ -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
2 changes: 1 addition & 1 deletion charts/woodpecker-server/Chart.yaml
Expand Up @@ -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
2 changes: 1 addition & 1 deletion cli/drone/build/build_approve.go
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/drone/build/build_decline.go
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/drone/build/build_info.go
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/drone/build/build_kill.go
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/drone/build/build_last.go
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/drone/build/build_list.go
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/drone/build/build_ps.go
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/drone/build/build_queue.go
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/drone/build/build_start.go
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/drone/build/build_stop.go
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions cli/drone/deploy/deploy.go
Expand Up @@ -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"
)
Expand Down
20 changes: 10 additions & 10 deletions cli/drone/exec/exec.go
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion cli/drone/info/info.go
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion cli/drone/internal/util.go
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion cli/drone/log/log_purge.go
Expand Up @@ -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"
)

Expand Down
18 changes: 9 additions & 9 deletions cli/drone/main.go
Expand Up @@ -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"
Expand Down