[RB] Try to set default branch env var for better snapshot matching #6085
Conversation
|
This stack of pull requests is managed by Graphite. Learn more about stacking. Join @maggie-lou and the rest of your teammates on |
maggie-lou
force-pushed
the
rb_default_branch
branch
2 times, most recently
from
8ea4b07
to
7cb3f4b
Compare
maggie-lou
changed the title
| @@ -197,6 +188,13 @@ func (r *runnerService) createAction(ctx context.Context, req *rnpb.RunRequest, | |||
| }) | |||
| } | |||
|
|
|||
| for k, v := range req.GetEnv() { | |||
There was a problem hiding this comment.
When generating fallback snapshot keys, we only look at cmd.EnvironmentVariables, and not at the --env_overrides flag
There was a problem hiding this comment.
Makes sense - do we need env_overrides anymore after this change or can we remove it?
There was a problem hiding this comment.
No we don't. Cleaned up in workflow service too. Don't know why I didn't implement this way to begin with...
maggie-lou
force-pushed
the
rb_default_branch
branch
from
7cb3f4b
to
a058436
Compare
| @@ -22,7 +22,7 @@ jobs: | |||
|
|
|||
| - name: Test | |||
| run: | | |||
| bb remote test //... \ | |||
| bb remote --env=GIT_REPO_DEFAULT_BRANCH=master test //... \ | |||
There was a problem hiding this comment.
The remote bazel code determines the default branch from the local git state. The github runner only checks out one commit, so we'd have to do that hacky thing where we briefly checkout master in order to take advantage of that. It's easier to just explicitly pass the flag
| @@ -197,6 +188,13 @@ func (r *runnerService) createAction(ctx context.Context, req *rnpb.RunRequest, | |||
| }) | |||
| } | |||
|
|
|||
| for k, v := range req.GetEnv() { | |||
There was a problem hiding this comment.
Makes sense - do we need env_overrides anymore after this change or can we remove it?
maggie-lou
force-pushed
the
rb_default_branch
branch
from
a058436
to
2230f19
Compare
maggie-lou
force-pushed
the
rb_default_branch
branch
from
2230f19
to
499c827
Compare
The snapshot key is based off the git branch. If we do not have a snapshot for a branch, we support falling back to snapshots for default branches, as specified in the
GIT_REPO_DEFAULT_BRANCHandGIT_BASE_BRANCHenv vars.This change will enable more snapshot hits.
Related issues: N/A