Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion build/raise-build-plugin-version/raise.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ source "../raiseRepo.sh"
tmpDirectory=$workDir

function updateSingleRepo {
.ivy/raise-build-plugin-version.sh ${releaseVersion} ${snapshotVersion} >> 'maven.log'
.ivy/raise-build-plugin-version.sh ${releaseVersion} ${snapshotVersion} 1>/dev/null
}

function raiseVersionOfOurRepos {
Expand Down
16 changes: 1 addition & 15 deletions build/raise-deps/raise.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,22 +56,8 @@ function raiseDepsOfOurRepos {
runRepoUpdate 'updateSingleRepo' ${repos[@]}
}

raiseErrors=""

function updateSingleRepo {
set +e
{ # try
.ivy/raise-deps.sh ${newVersion}
} || { # catch
skipReason="raise to version ${newVersion} failed!"
raiseErrors+="${repo}: ${skipReason}"
}
set -e
.ivy/raise-deps.sh ${newVersion}
}

raiseDepsOfOurRepos

if ! [ -z "${raiseErrors}" ]; then
echo "Raising of repos failed on some repos: ${raiseErrors}";
exit 127
fi
21 changes: 20 additions & 1 deletion build/raiseRepo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ function runRepoUpdate {
echo " - ${repo}"
done

raiseErrors=""
reposToPush=()

for repo in "${repos[@]}"; do
Expand All @@ -52,7 +53,19 @@ function runRepoUpdate {
git checkout -q -b "${newBranch}"

skipReason=""
${updateAction}

#set +e
{ # try
echo "-----------------> start"
${updateAction}
echo "-----------------> done"
} || { # catch
echo "-----------------> fail"
skipReason="raise action failed!"
raiseErrors+="${repo}: ${skipReason}"
}
#set -e

if [[ -n ${skipReason} ]]; then
echo ""; echo "--> skipping repo '${repo}' because: ${skipReason}";
continue
Expand Down Expand Up @@ -122,4 +135,10 @@ function runRepoUpdate {
echo ""; echo "--> finished pushing repo '${repo}'";
done
cd "${currentDir}"

if ! [ -z "${raiseErrors}" ]; then
echo "Raising of repos failed on some repos: ${raiseErrors}";
exit 127
fi

}