Skip to content
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

Jump to bottom

Branch OptaPlanner 8: shell script changes #1376

Merged
merged 9 commits into from
Jul 1, 2020
Merged

Branch OptaPlanner 8: shell script changes #1376

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bbaded6
Branch OptaPlanner 8: git-clone-others.sh
ge0ffrey Jun 26, 2020
c841ff9
Branch OptaPlanner 8: revapi-clean.sh
ge0ffrey Jun 26, 2020
9e12c16
Branch OptaPlanner 8: git-clone-others.sh Fix "-b <branch>"
ge0ffrey Jun 30, 2020
83105a3
oldbranches.pl should not try to delete 6.x or 7.x (blind commit)
ge0ffrey Jun 30, 2020
ecb8ca2
Branch OptaPlanner 8: git-clone-others.sh Fix "--branch <branch>"
ge0ffrey Jun 30, 2020
a3c46c6
Branch OptaPlanner 8: reuse for $REVAPI_REPOSITORIES
ge0ffrey Jun 30, 2020
aeedacd
Branch OptaPlanner 8: fix "--branch master --depth"
ge0ffrey Jul 1, 2020
82ac648
Branch OptaPlanner 8: fix git options for repo's after a branched repo
ge0ffrey Jul 1, 2020
e7a8786
Branch OptaPlanner 8: fix "Potentially dangerous array expansion"
ge0ffrey Jul 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions script/branched-7-repository-list.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
optaplanner
2 changes: 1 addition & 1 deletion script/checks/oldbranches.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ ()
chomp;
s/^..([^ ]+).*/$1/;
if( s#remotes/$source/## ) {
if( m/r?\d\.\d\.(\d\.((M\d|Beta\d|GA)\.)?)?(x|Final)|HEAD|master$/ ) {
if( m/r?\d\.(\d\.(\d\.((M\d|Beta\d|GA)\.)?)?)?(x|Final)|HEAD|master$/ ) {
if( $verbose ) {
print " $_\n";
}
Expand Down
62 changes: 0 additions & 62 deletions script/git-clone-others.bat
View file
Open in desktop

This file was deleted.

25 changes: 19 additions & 6 deletions script/git-clone-others.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ additionalGitOptions=()

# default repository list is stored in the repository-list.txt file
REPOSITORY_LIST=`cat "${scriptDir}/repository-list.txt"`
# Repositories that need to use the branch 7.x instead of master
BRANCHED_7_REPOSITORY_LIST=`cat "${scriptDir}/branched-7-repository-list.txt"`

for arg in "$@"
do
Expand Down Expand Up @@ -103,7 +105,23 @@ for repository in $REPOSITORY_LIST ; do
if [ "x${additionalGitOptions}" != "x" ]; then
echo -- additional Git options: ${additionalGitOptions[@]} --
fi
git clone ${additionalGitOptions[@]} ${gitUrlPrefix}${repository}.git ${repository}

repoAdditionalGitOptions=( "${additionalGitOptions[@]}" )
if [ $(echo "$BRANCHED_7_REPOSITORY_LIST" | grep "^$repository$") ] ; then
if [[ ${additionalGitOptions[0]} == "-b" ]] || [[ ${additionalGitOptions[0]} == "--branch" ]]; then
if [[ ${additionalGitOptions[1]} == "master" ]]; then
repoAdditionalGitOptions[1]="7.x"
fi
else
repoAdditionalGitOptions=( "-b" "7.x" "${repoAdditionalGitOptions[@]}" )
fi
fi
git clone ${repoAdditionalGitOptions[@]} ${gitUrlPrefix}${repository}.git ${repository}
ge0ffrey marked this conversation as resolved.
Show resolved Hide resolved

ge0ffrey marked this conversation as resolved.
Show resolved Hide resolved
returnCode=$?
if [ $returnCode != 0 ] ; then
exit $returnCode
fi

if [ "$UPSTREAM" = true ]; then
upstreamGitUrlPrefix=`echo ${gitUrlPrefix} | sed 's|\(.*github\.com[:/]\).*|\1kiegroup/|'`
Expand All @@ -112,11 +130,6 @@ for repository in $REPOSITORY_LIST ; do
git remote add upstream ${upstreamGitUrlPrefix}${repository}.git
cd ..
fi

returnCode=$?
if [ $returnCode != 0 ] ; then
exit $returnCode
fi
fi
done

Expand Down
10 changes: 7 additions & 3 deletions script/utils/revapi-clean.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
#!/bin/sh
# How to clean ignores in revapi-config.json files:
#
# export REVAPI_REPOSITORIES=droolsjbpm-build-bootstrap,droolsjbpm-knowledge,drools,jbpm,droolsjbpm-integration,optaplanner
# export MASTER_REVAPI_REPOSITORIES=droolsjbpm-build-bootstrap,droolsjbpm-knowledge,drools,jbpm,droolsjbpm-integration
# export BRANCHED_7_REVAPI_REPOSITORIES=optaplanner
# export REVAPI_REPOSITORIES=$MASTER_REVAPI_REPOSITORIES,$BRANCHED_7_REVAPI_REPOSITORIES
#
# ./git-clone-others.sh --repo-list=$REVAPI_REPOSITORIES --add-upstream-remote
# ./git-all.sh --repo-list=$REVAPI_REPOSITORIES checkout master
# ./git-all.sh --repo-list=$REVAPI_REPOSITORIES pull --rebase upstream master
# ./git-all.sh --repo-list=MASTER_REVAPI_REPOSITORIES checkout master
# ./git-all.sh --repo-list=MASTER_REVAPI_REPOSITORIES pull --rebase upstream master
# ./git-all.sh --repo-list=BRANCHED_7_REVAPI_REPOSITORIES checkout 7.x
# ./git-all.sh --repo-list=BRANCHED_7_REVAPI_REPOSITORIES pull --rebase upstream 7.x
# ./git-all.sh --repo-list=$REVAPI_REPOSITORIES checkout -b revapi-7.23.0.Final
# Copy this script to root of all repositories and run it there, ./revapi-clean.sh 7.23.0.Final
# Update <revapi.oldKieVersion> in kie-parent
Expand Down