diff --git a/home/jobs/BIOFORMATS-push/config.xml b/home/jobs/BIOFORMATS-push/config.xml index 93f54db5..b6067af9 100644 --- a/home/jobs/BIOFORMATS-push/config.xml +++ b/home/jobs/BIOFORMATS-push/config.xml @@ -85,7 +85,7 @@ MERGE_OPTIONS="$MERGE_OPTIONS -S $STATUS" cd bio-formats-build echo "Merge base repository (no submodule updates)" -scc merge -v $MERGE_OPTIONS --shallow $BASE_BRANCH +scc merge $MERGE_OPTIONS --shallow master # Update any changed submodules git submodule sync @@ -93,7 +93,7 @@ git submodule update --remote --recursive echo "Merge all submodules using repository configuration:" cat "scripts/repositories.yml" -scc merge -v "--repository-config=$(pwd)/scripts/repositories.yml" $MERGE_OPTIONS --update-gitmodules --push $PUSH_BRANCH $BASE_BRANCH +scc merge "--repository-config=$(pwd)/scripts/repositories.yml" $MERGE_OPTIONS --update-gitmodules --push $PUSH_BRANCH master echo "Update maven component versions" update-versions @@ -105,6 +105,11 @@ git submodule foreach "git commit -m 'Update component versions' echo "Push all branches" user=$(git config github.user) git submodule foreach "git push -f git@github.com:$user/"'${path}.git'" HEAD:$PUSH_BRANCH" + +echo "Commit all component version changes" +git add -u +git commit -m 'Update component versions' || true + git push -f git@github.com:$user/bio-formats-build.git HEAD:$PUSH_BRANCH