moved to drone-exec

This commit is contained in:
Brad Rydzewski 2015-09-02 16:52:59 -07:00
parent b1150ce6fb
commit ae324704bb
4 changed files with 10 additions and 11 deletions

View file

@ -3,6 +3,12 @@
SHA := $(shell git rev-parse --short HEAD) SHA := $(shell git rev-parse --short HEAD)
VERSION := 0.4.0-alpha VERSION := 0.4.0-alpha
all: build
build:
go run make.go bindata build
# Execute the database test suite against mysql 5.5 # Execute the database test suite against mysql 5.5
# #
# You can launch a mysql container locally for testing: # You can launch a mysql container locally for testing:

View file

@ -182,7 +182,6 @@ func build() error {
}{ }{
{"github.com/drone/drone/cmd/drone-server", "bin/drone"}, {"github.com/drone/drone/cmd/drone-server", "bin/drone"},
{"github.com/drone/drone/cmd/drone-agent", "bin/drone-agent"}, {"github.com/drone/drone/cmd/drone-agent", "bin/drone-agent"},
{"github.com/drone/drone/cmd/drone-build", "bin/drone-build"},
} }
for _, bin := range bins { for _, bin := range bins {
ldf := fmt.Sprintf("-X main.revision=%s -X main.version=%s", sha, version) ldf := fmt.Sprintf("-X main.revision=%s -X main.version=%s", sha, version)
@ -267,7 +266,6 @@ func clean() error {
files := []string{ files := []string{
"bin/drone", "bin/drone",
"bin/drone-agent", "bin/drone-agent",
"bin/drone-build",
} }
for _, file := range files { for _, file := range files {

View file

@ -144,7 +144,7 @@ func (r *Runner) Run(w *queue.Work) error {
Repo: w.Repo, Repo: w.Repo,
Build: w.Build, Build: w.Build,
Job: job, Job: job,
Yaml: w.Yaml, Yaml: string(w.Yaml),
} }
in, err := json.Marshal(work) in, err := json.Marshal(work)
if err != nil { if err != nil {
@ -224,7 +224,7 @@ func (r *Runner) Run(w *queue.Work) error {
Repo: w.Repo, Repo: w.Repo,
Build: w.Build, Build: w.Build,
Job: job, Job: job,
Yaml: w.Yaml, Yaml: string(w.Yaml),
} }
in, err := json.Marshal(work) in, err := json.Marshal(work)
if err != nil { if err != nil {

View file

@ -32,7 +32,7 @@ var (
DefaultAgent = "drone/drone-exec:latest" DefaultAgent = "drone/drone-exec:latest"
// default name of the build agent executable // default name of the build agent executable
DefaultEntrypoint = []string{"/bin/drone-build"} DefaultEntrypoint = []string{"/bin/drone-exec"}
// default argument to invoke build steps // default argument to invoke build steps
DefaultBuildArgs = []string{"--cache", "--clone", "--build", "--deploy"} DefaultBuildArgs = []string{"--cache", "--clone", "--build", "--deploy"}
@ -50,12 +50,7 @@ type work struct {
Job *types.Job `json:"job"` Job *types.Job `json:"job"`
System *types.System `json:"system"` System *types.System `json:"system"`
Workspace *types.Workspace `json:"workspace"` Workspace *types.Workspace `json:"workspace"`
Yaml []byte `json:"yaml"` Yaml string `json:"yaml"`
// Keys *types.Keypair `json:"keys"` // remove
// Netrc *types.Netrc `json:"netrc"` // remove
// Env []string `json:"environment"` // remove
// Plugins []string `json:"plugins"` // remove
} }
type worker struct { type worker struct {