Skip to content

Commit

Permalink
build: map in the full teamcity alternates directory
Browse files Browse the repository at this point in the history
Release note: None
  • Loading branch information
petermattis committed Apr 22, 2020
1 parent 3b556da commit 6c05dbd
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions build/builder.sh
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,15 @@ vols="${vols} --volume=${HOME}/.yarn-cache:${container_home}/.yarn-cache${cached

# If we're running in an environment that's using git alternates, like TeamCity,
# we must mount the path to the real git objects for git to work in the container.
alternates_file=${cockroach_toplevel}/.git/objects/info/alternates
if test -e "${alternates_file}"; then
alternates_path=$(cat "${alternates_file}")
vols="${vols} --volume=${alternates_path}:${alternates_path}${cached_volume_mode}"
# alternates_file=${cockroach_toplevel}/.git/objects/info/alternates
# if test -e "${alternates_file}"; then
# alternates_path=$(cat "${alternates_file}")
# vols="${vols} --volume=${alternates_path}:${alternates_path}${cached_volume_mode}"
# fi

teamcity_alternates="/home/agent/system/git/"
if test -d "${teamcity_alternates}"; then
vols="${vols} --volume=${teamcity_alternates}:${teamcity_alternates}${cached_volume_mode}"
fi

backtrace_dir=${cockroach_toplevel}/../../cockroachlabs/backtrace
Expand Down

0 comments on commit 6c05dbd

Please sign in to comment.