From 561dd15b0459dc296fdb036b2bfc9466c01f3402 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Wed, 20 Mar 2019 00:35:15 +0000 Subject: [PATCH] improve gnu scripts --- .travis.yml | 2 +- scripts/affected-libs.sh | 1 + scripts/smart-build.sh | 16 +++++++++++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index acbc8759a2..44d2ea1632 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,7 +53,7 @@ jobs: - ./scripts/lint.sh || exit 1 - rm -rf tmp && mkdir tmp - git merge-base origin/$TRAVIS_BRANCH HEAD > ./tmp/devhead.txt - - (./scripts/smart-build.sh -b $TRAVIS_BRANCH || exit 1;); + - (./scripts/smart-build.sh -b $TRAVIS_BRANCH -gnu || exit 1;); - npm run build:dist || exit 1 - ./scripts/license-list-generator.sh - stage: Unit test diff --git a/scripts/affected-libs.sh b/scripts/affected-libs.sh index cccb9a9f06..52e8fc7805 100755 --- a/scripts/affected-libs.sh +++ b/scripts/affected-libs.sh @@ -48,6 +48,7 @@ git merge-base origin/$BRANCH_NAME HEAD > ./$DIRECTORY/devhead.txt fi HEAD_SHA_BRANCH="$(cat ./$DIRECTORY/devhead.txt)" +echo "" echo "Branch name $BRANCH_NAME HEAD sha " $HEAD_SHA_BRANCH # tmp folder doesn't exist. diff --git a/scripts/smart-build.sh b/scripts/smart-build.sh index aa965ebe76..4406b2bbb6 100755 --- a/scripts/smart-build.sh +++ b/scripts/smart-build.sh @@ -1,20 +1,28 @@ #!/usr/bin/env bash eval BRANCH_NAME="" +eval GNU=false show_help() { echo "Usage: smart-build.sh" echo "" echo "-b branch name" + echo "-gnu for gnu" } branch_name(){ BRANCH_NAME=$1 } +gnu_mode() { + echo "====== GNU MODE =====" + GNU=true +} + while [[ $1 == -* ]]; do case "$1" in -b) branch_name $2; shift 2;; + -gnu) gnu_mode; shift;; -*) echo "invalid option: $1" 1>&2; show_help; exit 0;; esac done @@ -25,8 +33,14 @@ then exit 0 fi +if $GNU; then + gnu='-gnu' +else + gnu='' +fi + #reset the tmp folder -affected="$(./scripts/affected-libs.sh -gnu -b "$BRANCH_NAME")" +affected="$(./scripts/affected-libs.sh ${gnu[@]} -b "$BRANCH_NAME")" echo $affected libs=(`echo $affected | sed 's/^$/\n/g'`)