Skip to content

Commit

Permalink
Merge branch 'master' into dont-show-env-key-values
Browse files Browse the repository at this point in the history
  • Loading branch information
toolmantim committed May 12, 2016
2 parents 4d39c6a + ebf44ce commit 14874cd
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ steps:
name: "🔨"
command: "scripts/tests.sh"
plugins:
- ssh://git@github.com/buildkite/plugins/docker-compose:
container: "agent"
- https://github.com/buildkite/docker-compose-buildkite-plugin#aec9131:
run: agent

-
name: "📦"
command: "scripts/build-binaries.sh"
artifact_paths: "pkg/*"
plugins:
- ssh://git@github.com/buildkite/plugins/docker-compose:
container: "agent"
- https://github.com/buildkite/docker-compose-buildkite-plugin#aec9131:
run: agent

- wait

Expand Down Expand Up @@ -51,8 +51,8 @@ steps:
artifact_paths: "releases/**/*"
branches: "master *-stable"
plugins:
- ssh://git@github.com/buildkite/plugins/docker-compose:
container: "agent"
- https://github.com/buildkite/docker-compose-buildkite-plugin#aec9131:
run: agent

- wait

Expand Down

0 comments on commit 14874cd

Please sign in to comment.