Skip to content

BUG: Fix remotes maintenance scripts #1021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dzenanz merged 1 commit into from
Jun 17, 2019
Merged

BUG: Fix remotes maintenance scripts #1021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 17 additions & 5 deletions Utilities/Maintenance/ApplyScriptToRemotes.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ script="$1"
feature_branch="$2"
commit_message="$3"

if test "${script}" = "" || "${feature_branch}" = "" || "${commit_message}" = "" || $help; then
if test "${script}" = "" || test "${feature_branch}" = "" || test "${commit_message}" = "" || $help; then
usage
exit 1
fi
Expand Down Expand Up @@ -175,11 +175,23 @@ function apply_script_and_push_remotes() {
git checkout -b $feature_branch origin/master
$script

# Add the files, adding filters if necessary
git add -u *.txt ./*.cmake ./*.rst ./*.py ./*.yml ./*.c ./*.cxx ./*.h ./*.hxx ./*.wrap
# Add the files, adding filters if necessary, and redirecting stdout and
# stderr to /dev/null in order to avoid a too verbose output and
# displaying error messages if files with some given extensions are not
# found.
git add -u *.txt > /dev/null 2>&1
git add -u *.cmake > /dev/null 2>&1
git add -u *.rst > /dev/null 2>&1
git add -u *.py > /dev/null 2>&1
git add -u *.yml > /dev/null 2>&1
git add -u *.c > /dev/null 2>&1
git add -u *.cxx > /dev/null 2>&1
git add -u *.h > /dev/null 2>&1
git add -u *.hxx > /dev/null 2>&1
git add -u *.wrap > /dev/null 2>&1

# Commit and push to the feature branch
git commit -m $commit_message
git commit -m "$commit_message"
git push --quiet https://$username:$password@github.com/$username/$repository_basename $feature_branch

cd ..
Expand All @@ -198,6 +210,6 @@ echo -e "Applying script to remotes..."
apply_script_and_push_remotes
echo -e "Done applying script to remotes."

rm -r ../../../ITK-build
rm -Rf ../../../ITK-build

echo -e "Visit the remote repositories and open the corresponding pull requests."
2 changes: 1 addition & 1 deletion Utilities/Maintenance/UpdateRequiredITKVersionInRemoteModules.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ done
azure_pipelines_ci_filename=$1
python_setup_filename=$2

if test "${azure_pipelines_ci_filename}" = "" || "${python_setup_filename}" = "" || $help; then
if test "${azure_pipelines_ci_filename}" = "" || test "${python_setup_filename}" = "" || $help; then
usage
exit 1
fi
Expand Down