Skip to content

Commit

Permalink
moved to drone-exec
Browse files Browse the repository at this point in the history
  • Loading branch information
bradrydzewski committed Sep 2, 2015
1 parent b1150ce commit ae32470
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 11 deletions.
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
SHA := $(shell git rev-parse --short HEAD)
VERSION := 0.4.0-alpha

all: build

build:
go run make.go bindata build


# Execute the database test suite against mysql 5.5
#
# You can launch a mysql container locally for testing:
Expand Down
2 changes: 0 additions & 2 deletions make.go
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,6 @@ func build() error {
}{
{"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-build", "bin/drone-build"},
}
for _, bin := range bins {
ldf := fmt.Sprintf("-X main.revision=%s -X main.version=%s", sha, version)
Expand Down Expand Up @@ -267,7 +266,6 @@ func clean() error {
files := []string{
"bin/drone",
"bin/drone-agent",
"bin/drone-build",
}

for _, file := range files {
Expand Down
4 changes: 2 additions & 2 deletions pkg/runner/builtin/runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ func (r *Runner) Run(w *queue.Work) error {
Repo: w.Repo,
Build: w.Build,
Job: job,
Yaml: w.Yaml,
Yaml: string(w.Yaml),
}
in, err := json.Marshal(work)
if err != nil {
Expand Down Expand Up @@ -224,7 +224,7 @@ func (r *Runner) Run(w *queue.Work) error {
Repo: w.Repo,
Build: w.Build,
Job: job,
Yaml: w.Yaml,
Yaml: string(w.Yaml),
}
in, err := json.Marshal(work)
if err != nil {
Expand Down
9 changes: 2 additions & 7 deletions pkg/runner/builtin/worker.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ var (
DefaultAgent = "drone/drone-exec:latest"

// default name of the build agent executable
DefaultEntrypoint = []string{"/bin/drone-build"}
DefaultEntrypoint = []string{"/bin/drone-exec"}

// default argument to invoke build steps
DefaultBuildArgs = []string{"--cache", "--clone", "--build", "--deploy"}
Expand All @@ -50,12 +50,7 @@ type work struct {
Job *types.Job `json:"job"`
System *types.System `json:"system"`
Workspace *types.Workspace `json:"workspace"`
Yaml []byte `json:"yaml"`

// Keys *types.Keypair `json:"keys"` // remove
// Netrc *types.Netrc `json:"netrc"` // remove
// Env []string `json:"environment"` // remove
// Plugins []string `json:"plugins"` // remove
Yaml string `json:"yaml"`
}

type worker struct {
Expand Down

0 comments on commit ae32470

Please sign in to comment.