Merge pull request #28 from buildtool/buildkite

bug: fixed env variables for buildkite.

.goreleaser.yml

@@ -93,6 +93,6 @@ changelog:
   sort: asc
   filters:
     exclude:
-    - 'Merge'
+    - '^Merge'
     - '^docs:'
     - '^test:'

pkg/ci/buildkite.go

@@ -4,7 +4,7 @@ type Buildkite struct {
 	*Common
 	CICommit     string `env:"BUILDKITE_COMMIT"`
 	CIBuildName  string `env:"BUILDKITE_PIPELINE_SLUG"`
-	CIBranchName string `env:"BUILDKITE_BRANCH_NAME"`
+	CIBranchName string `env:"BUILDKITE_BRANCH"`
 }
 
 var _ CI = &Buildkite{}

pkg/config/ci_test.go

@@ -97,7 +97,7 @@ func TestCommit_VCS_Fallback_Azure(t *testing.T) {
 func TestIdentify_Buildkite(t *testing.T) {
 	defer pkg.SetEnv("BUILDKITE_COMMIT", "abc123")()
 	defer pkg.SetEnv("BUILDKITE_PIPELINE_SLUG", "reponame")()
-	defer pkg.SetEnv("BUILDKITE_BRANCH_NAME", "feature/first test")()
+	defer pkg.SetEnv("BUILDKITE_BRANCH", "feature/first test")()
 
 	out := &bytes.Buffer{}
 	cfg, err := Load(name, out)

www/content/ci.md

@@ -27,21 +27,27 @@ steps:
       build
       push
     label: build
-
+    plugins:
+      - docker#v3.3.0:
+          image: buildtool/build-tools
+          volumes:
+            - "/var/run/docker.sock:/var/run/docker.sock"
+          propagate-environment: true
   - wait
 
-  - command: |-
-      ${BUILD_TOOLS_PATH}/deploy staging
-    label: Deploy to staging
-    branches: "master"
-
   - block: ":rocket: Release PROD"
     branches: "master"
 
   - command: |-
       ${BUILD_TOOLS_PATH}/deploy prod
     label: Deploy PROD
     branches: "master"
+    plugins:
+      - docker#v3.3.0:
+          image: buildtool/build-tools
+          volumes:
+            - "/var/run/docker.sock:/var/run/docker.sock"
+          propagate-environment: true
 ```
 
 ### Gitlab CI