From 1e82190242cf8a5c12b2d5ef6f9c51d0905f4021 Mon Sep 17 00:00:00 2001 From: shubhamchaudhary Date: Thu, 3 Oct 2019 13:57:27 +0530 Subject: [PATCH] Add[CI]: Combine Experiments CR Signed-off-by: shubhamchaudhary --- .travis.yml | 2 +- Makefile | 6 +++--- scripts/{merge_all_cr.sh => combine_all_cr.sh} | 0 3 files changed, 4 insertions(+), 4 deletions(-) rename scripts/{merge_all_cr.sh => combine_all_cr.sh} (100%) diff --git a/.travis.yml b/.travis.yml index 64c5073..34cdabe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ dist: xenial # ubuntu 16.04 distro script: # runs only when PR is merged - make versionmaker - - make mergeExpCR + - make combineExpCR after_success: # runs only when PR is merged and push the version file to master version - if [[ $TRAVIS_PULL_REQUEST == 'false' ]]; then make push; fi diff --git a/Makefile b/Makefile index b02cb78..3dae641 100644 --- a/Makefile +++ b/Makefile @@ -6,10 +6,10 @@ versionmaker: @echo "-----version maker-----" bash ./scripts/version_maker.sh -.PHONY: mergeExpCR +.PHONY: combineExpCR push: - @echo "--------merging experiment Crs-------" - bash ./scripts/merge_all_cr.sh + @echo "--------Combining Experiments CR-------" + bash ./scripts/combine_all_cr.sh .PHONY: push push: diff --git a/scripts/merge_all_cr.sh b/scripts/combine_all_cr.sh similarity index 100% rename from scripts/merge_all_cr.sh rename to scripts/combine_all_cr.sh