Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Sewe2017-08-30 07:37:58 -0400
committerAndreas Sewe2017-08-30 08:40:14 -0400
commitc6dc6bffaeebed296063b84412f52d616380d86a (patch)
tree3b5519e3d694e1af8937c9ab49122aa11ed5a2b6
parent29bff10fd74b66d32a71d5cae08ef2782d137e38 (diff)
downloadorg.eclipse.epp.packages-c6dc6bffaeebed296063b84412f52d616380d86a.tar.gz
org.eclipse.epp.packages-c6dc6bffaeebed296063b84412f52d616380d86a.tar.xz
org.eclipse.epp.packages-c6dc6bffaeebed296063b84412f52d616380d86a.zip
Bug 521594 - Change detection heuristic gets confused on branches
Change-Id: I3162793616bb0fbc997069fa2d7ae2010b724e96 Signed-off-by: Andreas Sewe <andreas.sewe@codetrails.com>
-rwxr-xr-xreleng/org.eclipse.epp.config/tools/createSettings.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/releng/org.eclipse.epp.config/tools/createSettings.sh b/releng/org.eclipse.epp.config/tools/createSettings.sh
index 1c1a7502..da484f0e 100755
--- a/releng/org.eclipse.epp.config/tools/createSettings.sh
+++ b/releng/org.eclipse.epp.config/tools/createSettings.sh
@@ -46,10 +46,10 @@ echo " </mirrors>" >>$SETTINGS_FILE
echo " <activeProfiles>" >>$SETTINGS_FILE
-### use the OXYGEN commit to find out which package directories contain a change
+### use the parent commit to find out which package directories contain a change
PACKAGES="${IGNORED_PACKAGES}"
cd ${WORKSPACE}/${GIT_REPOSITORY}
-for II in `git diff-tree --name-only --no-commit-id -r OXYGEN | cut -d "/" -f 2 | cut -d "." -f 5 | sort | uniq`; do
+for II in `git diff-tree --name-only --no-commit-id -r HEAD | cut -d "/" -f 2 | cut -d "." -f 5 | sort | uniq`; do
if [[ "common" =~ ${II} ]]
then
echo "${II} found; will trigger a full package build."
@@ -70,7 +70,7 @@ cd ${WORKSPACE}
### if there are changes in other areas of the Git repo then build everything
cd ${WORKSPACE}/${GIT_REPOSITORY}
-OTHERCHANGES="xxx`git diff-tree --name-only --no-commit-id -r OXYGEN | grep -v "^packages"`xxx"
+OTHERCHANGES="xxx`git diff-tree --name-only --no-commit-id -r HEAD | grep -v "^packages"`xxx"
if [ "${OTHERCHANGES}" != "xxxxxx" ] || [ "${FULL_BUILD}" == "true" ]
then
echo "Full build required. Adding all packages"

Back to the top