(drone-372) use the modern docker runner for exec, upgrade deps

harness · Jul 5, 2022 · 960e232 · 960e232
1 parent c992a25
commit 960e232
Show file tree

Hide file tree

Showing 13 changed files with 688 additions and 677 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -4,12 +4,12 @@ name: default
 
 steps:
 - name: test
-  image: golang:1.16
+  image: golang:1.18
   commands:
   - go test ./...
 
 - name: build
-  image: golang:1.16
+  image: golang:1.18
   commands:
   - sh .drone.sh
 

diff --git a/drone/exec/env.go b/drone/exec/env.go
@@ -63,15 +63,3 @@ func prefixedEnviron(environ []string) map[string]string {
 	}
 	return envs
 }
-
-// helper function combines one or more maps of environment
-// variables into a single map.
-func combineEnviron(env ...map[string]string) map[string]string {
-	c := map[string]string{}
-	for _, e := range env {
-		for k, v := range e {
-			c[k] = v
-		}
-	}
-	return c
-}