From b21fedb2289a2a17b2493dab7b9277bb0f9ed724 Mon Sep 17 00:00:00 2001
From: "sam.tang" <sam.tang.sw@gmail.com>
Date: Fri, 17 Sep 2021 16:55:34 +0800
Subject: [PATCH] fix: cli matrix filter

---
 cli/drone/exec/exec.go | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/cli/drone/exec/exec.go b/cli/drone/exec/exec.go
index d654b2c1e7..fe1ad51843 100644
--- a/cli/drone/exec/exec.go
+++ b/cli/drone/exec/exec.go
@@ -6,7 +6,6 @@ import (
 	"io"
 	"io/ioutil"
 	"log"
-	"os"
 	"path"
 	"path/filepath"
 	"runtime"
@@ -318,7 +317,7 @@ func execWithAxis(c *cli.Context, axis matrix.Axis) error {
 		file = ".drone.yml"
 	}
 
-	metadata := metadataFromContext(c)
+	metadata := metadataFromContext(c, axis)
 	environ := metadata.Environ()
 	secrets := []compiler.Secret{}
 	for k, v := range metadata.EnvironDrone() {
@@ -332,12 +331,6 @@ func execWithAxis(c *cli.Context, axis matrix.Axis) error {
 		})
 	}
 
-	if len(axis) != 0 {
-		for k, v := range axis {
-			environ[k] = v
-		}
-	}
-
 	droneEnv := make(map[string]string)
 	for _, env := range c.StringSlice("env") {
 		envs := strings.SplitN(env, "=", 2)
@@ -434,7 +427,7 @@ func execWithAxis(c *cli.Context, axis matrix.Axis) error {
 }
 
 // return the metadata from the cli context.
-func metadataFromContext(c *cli.Context) frontend.Metadata {
+func metadataFromContext(c *cli.Context, axis matrix.Axis) frontend.Metadata {
 	return frontend.Metadata{
 		Repo: frontend.Repo{
 			Name:    c.String("repo-name"),
@@ -488,7 +481,7 @@ func metadataFromContext(c *cli.Context) frontend.Metadata {
 		},
 		Job: frontend.Job{
 			Number: c.Int("job-number"),
-			Matrix: availableEnvironment(),
+			Matrix: axis,
 		},
 		Sys: frontend.System{
 			Name: c.String("system-name"),
@@ -498,17 +491,6 @@ func metadataFromContext(c *cli.Context) frontend.Metadata {
 	}
 }
 
-func availableEnvironment() map[string]string {
-	result := make(map[string]string, 0)
-
-	for _, env := range os.Environ() {
-		pair := strings.SplitN(env, "=", 2)
-		result[pair[0]] = pair[1]
-	}
-
-	return result
-}
-
 func convertPathForWindows(path string) string {
 	base := filepath.VolumeName(path)
 	if len(base) == 2 {