Skip to content

Reapply #47007 with job-scoped repository caches #47328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gh-worker-dd-mergequeue-cf854d merged 2 commits into from
Mar 4, 2026
Merged

Reapply #47007 with job-scoped repository caches #47328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c596a6
Reapply #47007 with job-scoped repository caches
rdesgroppes Mar 4, 2026
287a621
Use Alex-provided URL for GOCACHE (more relevant)
rdesgroppes Mar 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .gitlab/build/bazel/defs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,16 @@
policy: pull$BAZEL_CACHE_POLICY_SUFFIX
when: on_success
- &bazel_cache
key: bazel-$CI_RUNNER_DESCRIPTION
# TODO(agent-build): revert key prefix to bazel-$CI_RUNNER_DESCRIPTION after switching to Go 1.26+:
# - issue: https://github.com/microsoft/go/issues/1994
# - fix: https://github.com/microsoft/go/pull/1998
key:
prefix: bazel-$CI_JOB_NAME
files: [ .go-version, .python-version ]
paths:
- .cache/bazel/*/cache
- .cache/go*
- .cache/ms-go*
- .cache/pip
policy: pull$BAZEL_CACHE_POLICY_SUFFIX
when: on_success
Expand Down
3 changes: 3 additions & 0 deletions tools/bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ if [ -n "${XDG_CACHE_HOME:-}" ]; then
>&2 echo "🔴 XDG_CACHE_HOME ($XDG_CACHE_HOME) must denote an absolute path!"
exit 2
fi
unset GOCACHE # https://pkg.go.dev/cmd/go#hdr-Build_and_test_caching
export GOMODCACHE="$XDG_CACHE_HOME"/go/mod # https://wiki.archlinux.org/title/XDG_Base_Directory#Partial
unset PIP_CACHE_DIR # https://pip.pypa.io/en/stable/topics/caching/#default-paths
if [[ -n "${CI:-}" && -z "${GITHUB_ACTIONS:-}" ]]; then
exec "$BAZEL_REAL" ${1:+"$1" --config=ci} "${@:2}"
fi
Expand Down
9 changes: 8 additions & 1 deletion tools/bazel.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,20 @@ if not exist "%XDG_CACHE_HOME%" (
)
)

:: Ensure `bazel` & managed toolchains honor `XDG_CACHE_HOME` if set: https://github.com/bazelbuild/bazel/issues/27808
:: Ensure `bazel` & managed toolchains honor `XDG_CACHE_HOME` as per https://wiki.archlinux.org/title/XDG_Base_Directory
if defined XDG_CACHE_HOME (
set "XDG_CACHE_HOME=!XDG_CACHE_HOME:/=\!"
if "!XDG_CACHE_HOME:~1,2!" neq ":\" if "!XDG_CACHE_HOME:~0,2!" neq "\\" (
>&2 echo 🔴 XDG_CACHE_HOME ^(!XDG_CACHE_HOME!^) must denote an absolute path!
exit /b 2
)
:: https://pkg.go.dev/cmd/go#hdr-Build_and_test_caching
set "GOCACHE=%XDG_CACHE_HOME%\go-build"
:: https://wiki.archlinux.org/title/XDG_Base_Directory#Partial
set "GOMODCACHE=%XDG_CACHE_HOME%\go\mod"
:: https://pip.pypa.io/en/stable/topics/caching/#default-paths
set "PIP_CACHE_DIR=%XDG_CACHE_HOME%\pip"
:: https://github.com/bazelbuild/bazel/issues/27808
set "bazel_home=%XDG_CACHE_HOME%\bazel"
set bazel_home_startup_option="--output_user_root=!bazel_home!"
) else (
Expand Down