Merge branch 'travis_upload' of github.com:pulsar256/cleanflight into travis_upload
This commit is contained in:
commit
35f3306efd
27
.travis.sh
27
.travis.sh
|
@ -24,26 +24,53 @@ elif [ $PUBLISHMETA ] && [ $PUBLISH_URL ] ; then
|
|||
${PUBLISH_URL}
|
||||
else
|
||||
if [ $PUBLISH_URL ] ; then
|
||||
<<<<<<< HEAD
|
||||
make -j4
|
||||
|
||||
|
||||
if [ -f ${TARGET_FILE}.bin ] ; then
|
||||
TARGET_FILE=${TARGET_FILE}.bin
|
||||
elif [ -f ${TARGET_FILE}.hex ] ; then
|
||||
=======
|
||||
make -j2
|
||||
|
||||
BRANCH=$(git rev-parse --abbrev-ref HEAD)
|
||||
REVISION=$(git rev-parse --short HEAD)
|
||||
RECENT_COMMITS=$(git shortlog -n25)
|
||||
TARGET_FILE=obj/cleanflight_${TARGET}
|
||||
|
||||
if [ -f ${TARGET_FILE}.bin ];
|
||||
then
|
||||
TARGET_FILE=${TARGET_FILE}.bin
|
||||
elif [ -f ${TARGET_FILE}.hex ];
|
||||
then
|
||||
>>>>>>> 483c62a5852c91099b286a69a669f1a13584eac4
|
||||
TARGET_FILE=${TARGET_FILE}.hex
|
||||
else
|
||||
echo "build artifact (hex or bin) for ${TARGET_FILE} not found, aborting";
|
||||
exit 1
|
||||
<<<<<<< HEAD
|
||||
fi
|
||||
=======
|
||||
fi
|
||||
>>>>>>> 483c62a5852c91099b286a69a669f1a13584eac4
|
||||
|
||||
curl \
|
||||
--form "file=@${TARGET_FILE}" \
|
||||
--form "revision=${REVISION}" \
|
||||
--form "branch=${BRANCH}" \
|
||||
<<<<<<< HEAD
|
||||
--form "last_commit_date=${LAST_COMMIT_DATE}" \
|
||||
--form "travis_job_id=${TRAVIS_JOB_ID}" \
|
||||
${PUBLISH_URL}
|
||||
else
|
||||
make -j2
|
||||
fi
|
||||
=======
|
||||
--form "recent_commits=${RECENT_COMMITS}" ${PUBLISH_URL}
|
||||
else
|
||||
make -j2
|
||||
fi
|
||||
|
||||
>>>>>>> 483c62a5852c91099b286a69a669f1a13584eac4
|
||||
fi
|
||||
|
|
Loading…
Reference in New Issue