diff --git a/init-tools.sh b/init-tools.sh index 9d86b3cf6..446c4eb85 100755 --- a/init-tools.sh +++ b/init-tools.sh @@ -14,12 +14,4 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli done DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" -# Load Branch Info -while read line; do - if [[ $line != \#* ]]; then - IFS='=' read -ra splat <<< "$line" - export ${splat[0]}="${splat[1]}" - fi -done < "$DIR/branchinfo.txt" - $DIR/scripts/obtain/dotnet-install.sh --channel $CHANNEL --verbose \ No newline at end of file diff --git a/run-build.sh b/run-build.sh index d956bc685..8a4de9e58 100755 --- a/run-build.sh +++ b/run-build.sh @@ -71,6 +71,14 @@ else exit 1 fi +# Load Branch Info +while read line; do + if [[ $line != \#* ]]; then + IFS='=' read -ra splat <<< "$line" + export ${splat[0]}="${splat[1]}" + fi +done < "$REPOROOT/branchinfo.txt" + # Use a repo-local install directory (but not the artifacts directory because that gets cleaned a lot [ -z "$DOTNET_INSTALL_DIR" ] && export DOTNET_INSTALL_DIR=$REPOROOT/.dotnet_stage0/$ARCHITECTURE [ -d "$DOTNET_INSTALL_DIR" ] || mkdir -p $DOTNET_INSTALL_DIR