Skip to content

Commit bb4c53d

Browse files
committed
Revert "revert cache change"
This reverts commit dae54d4.
1 parent 90d3fd2 commit bb4c53d

1 file changed

Lines changed: 0 additions & 12 deletions

File tree

lib/batches/execution/cache/cache.go

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,6 @@ func (key CacheKey) mountsMetadata() ([]MountMetadata, error) {
4747
return nil, nil
4848
}
4949

50-
// perRunEnvVars resolve to per-job or per-executor values that change on
51-
// every dequeue and must be stripped from cache keys. Mirrored in
52-
// sourcegraph/sourcegraph/lib/batches/execution/cache/cache.go.
53-
var perRunEnvVars = []string{
54-
"SRC_EXECUTOR_JOB_TOKEN",
55-
"SRC_EXECUTOR_JOB_ID",
56-
"SRC_EXECUTOR_NAME",
57-
}
58-
5950
// resolveStepsEnvironment returns a slice of environments for each of the steps,
6051
// containing only the env vars that are actually used.
6152
func resolveStepsEnvironment(globalEnv []string, steps []batches.Step) ([]map[string]string, error) {
@@ -73,9 +64,6 @@ func resolveStepsEnvironment(globalEnv []string, steps []batches.Step) ([]map[st
7364
if err != nil {
7465
return nil, errors.Wrapf(err, "resolving environment for step %d", i)
7566
}
76-
for _, name := range perRunEnvVars {
77-
delete(env, name)
78-
}
7967
envs[i] = env
8068
}
8169
return envs, nil

0 commit comments

Comments
 (0)