diff options
| author |   mbeierl <mark.beierl@dell.com> | 2017-08-24 17:26:37 -0400 |
|---|---|---|
| committer | mbeierl <mark.beierl@dell.com> | 2017-08-25 10:38:46 -0400 |
| commit | 18ab8f84a745cf861b51c66f4bb8301bba27ba1e (patch) | |
| tree | e9d07f9bb63ecf11d01b75a65076a87733ba55d9 /ci | |
| parent | fb1a5399bc99aa07f2a905a31e74cbc33708cd97 (diff) | |
Reinstating Merge
Change-Id: I94cf1d4c67bef421a25aef4f0da05514ebb83b96
Signed-off-by: mbeierl <mark.beierl@dell.com>
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/merge.sh | 3 | ||||
| -rwxr-xr-x | ci/verify-build.sh | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ci/merge.sh b/ci/merge.sh index 333a05c..bda24b6 100755 --- a/ci/merge.sh +++ b/ci/merge.sh @@ -8,4 +8,5 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -exit 0 +# Just run the verify again for now +`dirname $0`/verify.sh diff --git a/ci/verify-build.sh b/ci/verify-build.sh index dfa999c..0139845 100755 --- a/ci/verify-build.sh +++ b/ci/verify-build.sh @@ -11,13 +11,15 @@ cd `dirname $0` ci=`pwd` +exit 0 + cd ${ci}/../docker export ENV_FILE=${ci}/job/admin.rc export CARBON_DIR=${ci}/job/carbon/ -touch ${ENV_FILE} mkdir -p ${CARBON_DIR} +touch ${ENV_FILE} if [ -z $ARCH ] then |