diff options
| author | Sravan Kumar Lakkimsetti | 2017-12-01 02:02:24 +0000 |
|---|---|---|
| committer | Sravan Kumar Lakkimsetti | 2017-12-01 02:02:24 +0000 |
| commit | 7342e07ac55c913832beae9ac57523ac64513fda (patch) | |
| tree | cbf1974e3ec45dda41949fc5d106df6b9ba71182 | |
| parent | 6620e285f3b9b7b4d8c2e017dab9466fa75337bc (diff) | |
| download | eclipse.platform.releng.aggregator-7342e07ac55c913832beae9ac57523ac64513fda.tar.gz eclipse.platform.releng.aggregator-7342e07ac55c913832beae9ac57523ac64513fda.tar.xz eclipse.platform.releng.aggregator-7342e07ac55c913832beae9ac57523ac64513fda.zip | |
Bug 520206 - Don't start a build if there are commits in SWT after lastI20171130-2100
tag
Change-Id: I97a543a7971205a32d8c97c2d2a19cf0a2a10f3c
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
| -rwxr-xr-x | production/check-swt-buildinput.sh | 2 | ||||
| -rwxr-xr-x | production/master-build.sh | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/production/check-swt-buildinput.sh b/production/check-swt-buildinput.sh index 1920abf53..23b6bf3c7 100755 --- a/production/check-swt-buildinput.sh +++ b/production/check-swt-buildinput.sh @@ -28,7 +28,7 @@ commit=$(git log --pretty=oneline -1|cut -d' ' -f2-) popd if [[ $commit == v[0-9][0-9][0-9][0-9] ]]; then - echo "SWT build input succesful" + echo "SWT build input successful" exit 0 else echo "SWT build input failed" diff --git a/production/master-build.sh b/production/master-build.sh index 363d0a9de..c07369241 100755 --- a/production/master-build.sh +++ b/production/master-build.sh @@ -315,7 +315,8 @@ else set -x CHECK_SWT_INPUT=$logsDirectory/check-swt-buildinput_output.txt $SCRIPT_PATH/check-swt-buildinput.sh $BUILD_ENV_FILE 2>&1 | tee $CHECK_SWT_INPUT - if [ $? -eq 0 ] + /bin/grep "SWT build input successful" $CHECK_SWT_INPUT + if [ $? -ne 0 ] then buildrc=1 set +x |