Merge remote-tracking branch 'origin/master'

environ/environ.go

@@ -74,6 +74,7 @@ func Stage(stage *drone.Stage) map[string]string {
 		"DRONE_STAGE_OS":         stage.OS,
 		"DRONE_STAGE_ARCH":       stage.Arch,
 		"DRONE_STAGE_VARIANT":    stage.Variant,
+		"DRONE_STAGE_VERSION":    fmt.Sprint(stage.Version),
 		"DRONE_STAGE_STATUS":     "success",
 		"DRONE_STAGE_STARTED":    fmt.Sprint(stage.Started),
 		"DRONE_STAGE_FINISHED":   fmt.Sprint(stage.Stopped),

environ/environ_test.go

@@ -223,6 +223,7 @@ func TestStage(t *testing.T) {
 		OS:        "linux",
 		Arch:      "arm64",
 		Variant:   "7",
+		Version:   2004,
 		Status:    drone.StatusFailing,
 		Started:   1561421746,
 		Stopped:   1561421753,
@@ -251,6 +252,7 @@ func TestStage(t *testing.T) {
 		"DRONE_STAGE_OS":         "linux",
 		"DRONE_STAGE_ARCH":       "arm64",
 		"DRONE_STAGE_VARIANT":    "7",
+		"DRONE_STAGE_VERSION":    "2004",
 		"DRONE_STAGE_STATUS":     "failure",
 		"DRONE_STAGE_STARTED":    "1561421746",
 		"DRONE_STAGE_FINISHED":   "1561421753",

go.sum

@@ -27,6 +27,7 @@ github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/U
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-multierror v1.0.0 h1:iVjPR7a6H0tWELX5NxNe7bYopibicUzc7uPribsnS6o=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/natessilva/dag v0.0.0-20180124060714-7194b8dcc5c4 h1:dnMxwus89s86tI8rcGVp2HwZzlz7c5o92VOy7dSckBQ=
 github.com/natessilva/dag v0.0.0-20180124060714-7194b8dcc5c4/go.mod h1:cojhOHk1gbMeklOyDP2oKKLftefXoJreOQGOrXk+Z38=