Skip to content
Snippets Groups Projects
Commit 48ad993e authored by Jani Nikula's avatar Jani Nikula
Browse files

dim: update nightly.conf before using it

Do update_rerere_cache earlier to update nightly.conf too.
parent 9a4049d4
No related branches found
No related tags found
No related merge requests found
...@@ -190,6 +190,10 @@ function update_nightly ...@@ -190,6 +190,10 @@ function update_nightly
warn_or_fail "-nightly configuration file not commited" warn_or_fail "-nightly configuration file not commited"
fi fi
echo -n "Updating rerere cache and nightly.conf... "
update_rerere_cache >& /dev/null
echo "Done."
source $rerere/nightly.conf source $rerere/nightly.conf
cd $DIM_PREFIX/$integration_branch cd $DIM_PREFIX/$integration_branch
...@@ -205,10 +209,6 @@ function update_nightly ...@@ -205,10 +209,6 @@ function update_nightly
echo "Done." echo "Done."
done done
echo -n "Updating rerere cache... "
update_rerere_cache >& /dev/null
echo "Done."
# merge -fixes # merge -fixes
for tree in $nightly_branches; do for tree in $nightly_branches; do
local branch=${tree%:*} local branch=${tree%:*}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment