Skip to content

Commit

Permalink
Rename repo from 32leaves/werft to csweichel/werft
Browse files Browse the repository at this point in the history
  • Loading branch information
Christian Weichel committed Feb 9, 2020
1 parent 01c7401 commit ebfc067
Show file tree
Hide file tree
Showing 47 changed files with 269 additions and 235 deletions.
2 changes: 1 addition & 1 deletion .werft/debug.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pod:
sleep 5
echo "[build|PHASE] building stuff"
for i in $(seq 1 10); do sleep 2; echo "[foo] output $i"; done
echo "[url|RESULT] https://github.com/32leaves/werft the github project"
echo "[url|RESULT] https://github.com/csweichel/werft the github project"
echo "[url|RESULT] https://github.com/32leaves/tree/{{ .Repository.Ref }} this branch on Github"
echo "hello world"
echo "some more regular logging"
Expand Down
288 changes: 152 additions & 136 deletions BUILD.yaml
Original file line number Diff line number Diff line change
@@ -1,137 +1,153 @@
packages:
- name: server
type: go
deps:
- pkg/webui:rice
- pkg/store/postgres:rice
srcs:
- "**/*.go"
- "go.mod"
- "go.sum"
env:
- CGO_ENABLED=0
config:
generate: true
dontTest: true
buildFlags:
- -tags
- server
- name: plugin-client-lib
type: go
config:
packaging: library
srcs:
- "pkg/plugin/client/*.go"
- "pkg/plugin/common/*.go"
- "pkg/filterexpr/*.go"
- "pkg/reporef/*.go"
- "pkg/api/**/*.go"
- "go.mod"
- "go.sum"
- name: server-release
type: docker
deps:
- :server
- integrations/plugins/webhook:app
- integrations/plugins/cron:app
argdeps:
- version
- latestOrNext
config:
dockerfile: "server.Dockerfile"
image:
- csweichel/werft:${version}
- csweichel/werft:${latestOrNext}
- name: client-linux-amd64
type: go
srcs:
- "**/*.go"
- "go.mod"
- "go.sum"
env:
- CGO_ENABLED=0
- GOOS=linux
- GOARCH=amd64
config:
dontTest: true
buildFlags:
- -tags
- client
- name: nonesense-darwin
type: generic
- name: client-darwin-amd64
type: go
deps:
- :nonesense-darwin
srcs:
- "**/*.go"
- "go.mod"
- "go.sum"
env:
- CGO_ENABLED=0
- GOOS=darwin
- GOARCH=amd64
config:
dontTest: true
buildFlags:
- -tags
- client
- name: changelog
type: generic
srcs:
- ".git/**/*"
config:
commands:
# - ["git", "describe", "--exact-match", "HEAD"]
-
- sh
- -c
- |
latest=$(git describe --tags `git rev-list --tags --max-count=1`)
comparison="$latest..HEAD"
if [ -z "$latest" ]; then comparison=""; fi
git log $comparison --oneline --no-merges > changelog.txt
git rev-parse --abbrev-ref HEAD > version.txt
curl https://api.github.com/repos/csweichel/werft/compare/refs/tags/$latest...master | jq -r .commits[].author.login | sort | uniq > contributor.txt
echo "Version: $(cat version.txt)"
echo Changelog:
cat changelog.txt
echo Contributor:
cat contributor.txt
- name: release
type: generic
deps:
- :client-darwin-amd64
- :client-linux-amd64
- :server-release
- :changelog
argdeps:
- version
config:
commands:
-
- sh
- -c
- |
echo "## Server Docker images" >> desc.txt
echo "<pre>$(cat server-release/imgnames.txt)</pre>" >> desc.txt
echo >> desc.txt
echo "## Changelog" >> desc.txt
cat changelog/changelog.txt >> desc.txt
echo >> desc.txt
echo "## Contributor" >> desc.txt
for i in $(cat changelog/contributor.txt); do
echo "- [$i](https://github.com/$i)" >> desc.txt
done
- ["mkdir", "dist"]
- ["mv", "client-darwin-amd64/werft", "dist/werft-client-darwin-amd64"]
- ["mv", "client-linux-amd64/werft", "dist/werft-client-linux-amd64"]
- ["sh", "-c", "cd dist; for i in $(ls); do echo tar cvvfz $i.tar.gz $i; done | sh"]
- ["sh", "-c", "curl -L https://github.com/c4milo/github-release/releases/download/v1.1.0/github-release_v1.1.0_linux_amd64.tar.gz | tar xz"]
- ["sh", "-c", "./github-release 32leaves/werft ${version} master \"$(cat desc.txt)\" 'dist/*.tar.gz'"]
- name: all
type: generic
deps:
- :client-darwin-amd64
- :client-linux-amd64
- :server
- name: server
type: go
deps:
- pkg/webui:rice
- pkg/store/postgres:rice
argdeps:
- version
- commit
- date
srcs:
- "**/*.go"
- "go.mod"
- "go.sum"
env:
- CGO_ENABLED=0
config:
generate: true
dontTest: true
buildFlags:
- -tags
- server
- -ldflags
- -X 'github.com/csweichel/werft/pkg/version.Version=${version}' -X 'github.com/csweichel/werft/pkg/version.Commit=${commit}' -X 'github.com/csweichel/werft/pkg/version.Date=${date}'
- name: plugin-client-lib
type: go
config:
packaging: library
srcs:
- "pkg/plugin/client/*.go"
- "pkg/plugin/common/*.go"
- "pkg/filterexpr/*.go"
- "pkg/reporef/*.go"
- "pkg/api/**/*.go"
- "go.mod"
- "go.sum"
- name: server-release
type: docker
deps:
- :server
- integrations/plugins/webhook:app
- integrations/plugins/cron:app
argdeps:
- version
- latestOrNext
config:
dockerfile: "server.Dockerfile"
image:
- csweichel/werft:${version}
- csweichel/werft:${latestOrNext}
- name: client-linux-amd64
type: go
srcs:
- "**/*.go"
- "go.mod"
- "go.sum"
env:
- CGO_ENABLED=0
- GOOS=linux
- GOARCH=amd64
argdeps:
- version
- commit
- date
config:
dontTest: true
buildFlags:
- -tags
- client
- -ldflags
- -X 'github.com/csweichel/werft/pkg/version.Version=${version}' -X 'github.com/csweichel/werft/pkg/version.Commit=${commit}' -X 'github.com/csweichel/werft/pkg/version.Date=${date}'
- name: nonesense-darwin
type: generic
- name: client-darwin-amd64
type: go
deps:
- :nonesense-darwin
srcs:
- "**/*.go"
- "go.mod"
- "go.sum"
argdeps:
- version
- commit
- date
env:
- CGO_ENABLED=0
- GOOS=darwin
- GOARCH=amd64
config:
dontTest: true
buildFlags:
- -tags
- client
- -ldflags
- -X 'github.com/csweichel/werft/pkg/version.Version=${version}' -X 'github.com/csweichel/werft/pkg/version.Commit=${commit}' -X 'github.com/csweichel/werft/pkg/version.Date=${date}'
- name: changelog
type: generic
srcs:
- ".git/**/*"
config:
commands:
# - ["git", "describe", "--exact-match", "HEAD"]
- - sh
- -c
- |
latest=$(git describe --tags `git rev-list --tags --max-count=1`)
comparison="$latest..HEAD"
if [ -z "$latest" ]; then comparison=""; fi
git log $comparison --oneline --no-merges > changelog.txt
git rev-parse --abbrev-ref HEAD > version.txt
curl https://api.github.com/repos/csweichel/werft/compare/refs/tags/$latest...master | jq -r .commits[].author.login | sort | uniq > contributor.txt
echo "Version: $(cat version.txt)"
echo Changelog:
cat changelog.txt
echo Contributor:
cat contributor.txt
- name: release
type: generic
deps:
- :client-darwin-amd64
- :client-linux-amd64
- :server-release
- :changelog
argdeps:
- version
config:
commands:
- - sh
- -c
- |
echo "## Server Docker images" >> desc.txt
echo "<pre>$(cat server-release/imgnames.txt)</pre>" >> desc.txt
echo >> desc.txt
echo "## Changelog" >> desc.txt
cat changelog/changelog.txt >> desc.txt
echo >> desc.txt
echo "## Contributor" >> desc.txt
for i in $(cat changelog/contributor.txt); do
echo "- [$i](https://github.com/$i)" >> desc.txt
done
- ["mkdir", "dist"]
- ["mv", "client-darwin-amd64/werft", "dist/werft-client-darwin-amd64"]
- ["mv", "client-linux-amd64/werft", "dist/werft-client-linux-amd64"]
- ["sh", "-c", "cd dist; for i in $(ls); do echo tar cvvfz $i.tar.gz $i; done | sh"]
- ["sh", "-c", "curl -L https://github.com/c4milo/github-release/releases/download/v1.1.0/github-release_v1.1.0_linux_amd64.tar.gz | tar xz"]
- ["sh", "-c", "./github-release csweichel/werft ${version} master \"$(cat desc.txt)\" 'dist/*.tar.gz'"]
- name: all
type: generic
deps:
- :client-darwin-amd64
- :client-linux-amd64
- :server
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/32leaves/werft)
[![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/csweichel/werft)

<center><img src="logo.png" width="200px"></center>

Expand Down Expand Up @@ -125,7 +125,7 @@ The default cutter in Werft expects the following syntax:
Werft sports a powerful CI which can be used to create, list, start and listen to jobs.

### Installation
The Werft CLI is available on the [GitHub release page](https://github.com/32leaves/werft/releases), or using this one-liner:
The Werft CLI is available on the [GitHub release page](https://github.com/csweichel/werft/releases), or using this one-liner:
```bash
curl -L werft.dev/get-cli.sh | sh
```
Expand Down
2 changes: 1 addition & 1 deletion client.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
package main

import (
cmd "github.com/32leaves/werft/cmd/client"
cmd "github.com/csweichel/werft/cmd/client"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/client/job-get.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ package cmd
import (
"context"

v1 "github.com/32leaves/werft/pkg/api/v1"
v1 "github.com/csweichel/werft/pkg/api/v1"
"github.com/spf13/cobra"
"golang.org/x/xerrors"
)
Expand Down
4 changes: 2 additions & 2 deletions cmd/client/job-list.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"context"
"strings"

v1 "github.com/32leaves/werft/pkg/api/v1"
"github.com/32leaves/werft/pkg/filterexpr"
v1 "github.com/csweichel/werft/pkg/api/v1"
"github.com/csweichel/werft/pkg/filterexpr"
"github.com/spf13/cobra"
"golang.org/x/xerrors"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/client/job-logs.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"fmt"
"os"

v1 "github.com/32leaves/werft/pkg/api/v1"
v1 "github.com/csweichel/werft/pkg/api/v1"
"github.com/spf13/cobra"
"golang.org/x/xerrors"
)
Expand Down
4 changes: 2 additions & 2 deletions cmd/client/job.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"context"
"os"

v1 "github.com/32leaves/werft/pkg/api/v1"
"github.com/32leaves/werft/pkg/prettyprint"
v1 "github.com/csweichel/werft/pkg/api/v1"
"github.com/csweichel/werft/pkg/prettyprint"
"github.com/gogo/protobuf/proto"
"github.com/spf13/cobra"
"golang.org/x/xerrors"
Expand Down
4 changes: 2 additions & 2 deletions cmd/client/run-github.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import (
"path/filepath"
"strings"

v1 "github.com/32leaves/werft/pkg/api/v1"
"github.com/32leaves/werft/pkg/reporef"
v1 "github.com/csweichel/werft/pkg/api/v1"
"github.com/csweichel/werft/pkg/reporef"
"github.com/golang/protobuf/ptypes"
"github.com/spf13/cobra"
"golang.org/x/xerrors"
Expand Down
2 changes: 1 addition & 1 deletion cmd/client/run-local.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"strings"
"time"

v1 "github.com/32leaves/werft/pkg/api/v1"
v1 "github.com/csweichel/werft/pkg/api/v1"
"github.com/paulbellamy/ratecounter"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
Expand Down
2 changes: 1 addition & 1 deletion cmd/client/run-previous.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"context"
"fmt"

v1 "github.com/32leaves/werft/pkg/api/v1"
v1 "github.com/csweichel/werft/pkg/api/v1"
"github.com/golang/protobuf/ptypes"
"github.com/spf13/cobra"
)
Expand Down
Loading

0 comments on commit ebfc067

Please sign in to comment.