Skip to content

Commit

Permalink
Check release build as well before mergy
Browse files Browse the repository at this point in the history
IoT.js-DCO-1.0-Signed-off-by: Ilyong Cho ily.cho@samsung.com
  • Loading branch information
ILyoan committed Jun 24, 2015
1 parent 9f9d197 commit bf6a4b4
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions tools/merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@

SCRIPT_PATH = path.dirname(path.abspath(__file__))

BUILD_SCRIPT = path.join(SCRIPT_PATH, "build.py")
BUILD_SCRIPT_DEBUG = path.join(SCRIPT_PATH, "build.py --buildtype=debug")
BUILD_SCRIPT_RELEASE = path.join(SCRIPT_PATH, "build.py --buildtype=release")

GIT_REPO_FORMAT = 'https://github.com/%s/iotjs.git'

Expand Down Expand Up @@ -123,7 +124,8 @@ def git_remove_remote(fork_name, branch_name):


def check_build():
return run_cmd_code(BUILD_SCRIPT)
return (run_cmd_code(BUILD_SCRIPT_DEBUG) or
run_cmd_code(BUILD_SCRIPT_RELEASE))


def git_push():
Expand Down

0 comments on commit bf6a4b4

Please sign in to comment.