From ed2e1f068d7dc6588314d00a597d9f0fb396862a Mon Sep 17 00:00:00 2001 From: Steven Perron Date: Tue, 21 May 2024 10:02:20 -0400 Subject: [PATCH] Add abseil to the autoroller The autoroller does not update abseil, and that it stopping us from updating RE2. This change will update the auto roller, then the next time it runs, we should be able to update everything. --- utils/roll_deps.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/utils/roll_deps.sh b/utils/roll_deps.sh index d19ee000e5..a62ebe9bc5 100755 --- a/utils/roll_deps.sh +++ b/utils/roll_deps.sh @@ -29,13 +29,12 @@ function ExitIfIsInterestingError() { } -dependencies=("external/effcee/" - "external/googletest/" - "external/re2/" - "external/spirv-headers/") - - -branch="origin/main" +declare -A dependency_to_branch_map +dependency_to_branch_map["external/abseil_cpp"]="origin/master" +dependency_to_branch_map["external/effcee/"]="origin/main" +dependency_to_branch_map["external/googletest/"]="origin/main" +dependency_to_branch_map["external/re2/"]="origin/main" +dependency_to_branch_map["external/spirv-headers/"]="origin/main" # This script assumes it's parent directory is the repo root. repo_path=$(dirname "$0")/.. @@ -53,7 +52,8 @@ old_head=$(git rev-parse HEAD) set +e -for dep in ${dependencies[@]}; do +for dep in ${!dependency_to_branch_map[@]}; do + branch=${dependency_to_branch_map[$dep]} echo "Rolling $dep" roll-dep --ignore-dirty-tree --roll-to="${branch}" "${dep}" ExitIfIsInterestingError $?