1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-13 19:40:31 +03:00

preliminary support for pr builds / 3rd party builds

This commit is contained in:
Paul Rogalinski 2015-06-23 15:03:31 +02:00
parent 5dee96c3e0
commit 91cb62b257
3 changed files with 22 additions and 12 deletions

View file

@ -4,6 +4,9 @@ BRANCH=$(git rev-parse --abbrev-ref HEAD)
REVISION=$(git rev-parse --short HEAD) REVISION=$(git rev-parse --short HEAD)
LAST_COMMIT_DATE=$(git log -1 --date=short --format="%cd") LAST_COMMIT_DATE=$(git log -1 --date=short --format="%cd")
TARGET_FILE=obj/cleanflight_${TARGET} TARGET_FILE=obj/cleanflight_${TARGET}
REPONAME=${TRAVIS_REPO_SLUG:=$USER/undefined}
BUILDNAME=${BUILDNAME:=travis}
# A hacky way of running the unit tests at the same time as the normal builds. # A hacky way of running the unit tests at the same time as the normal builds.
if [ $RUNTESTS ] ; then if [ $RUNTESTS ] ; then
@ -32,6 +35,8 @@ elif [ $PUBLISHDOCS ] ; then
--form "branch=${BRANCH}" \ --form "branch=${BRANCH}" \
--form "last_commit_date=${LAST_COMMIT_DATE}" \ --form "last_commit_date=${LAST_COMMIT_DATE}" \
--form "travis_build_number=${TRAVIS_BUILD_NUMBER}" \ --form "travis_build_number=${TRAVIS_BUILD_NUMBER}" \
--form "github_repo=${REPONAME}" \
--form "build_name=${BUILDNAME}" \
${PUBLISH_URL} ${PUBLISH_URL}
fi fi
@ -44,6 +49,8 @@ elif [ $PUBLISHMETA ] ; then
--form "branch=${BRANCH}" \ --form "branch=${BRANCH}" \
--form "last_commit_date=${LAST_COMMIT_DATE}" \ --form "last_commit_date=${LAST_COMMIT_DATE}" \
--form "travis_build_number=${TRAVIS_BUILD_NUMBER}" \ --form "travis_build_number=${TRAVIS_BUILD_NUMBER}" \
--form "github_repo=${REPONAME}" \
--form "build_name=${BUILDNAME}" \
${PUBLISH_URL} ${PUBLISH_URL}
fi fi
@ -65,9 +72,10 @@ else
--form "branch=${BRANCH}" \ --form "branch=${BRANCH}" \
--form "last_commit_date=${LAST_COMMIT_DATE}" \ --form "last_commit_date=${LAST_COMMIT_DATE}" \
--form "travis_build_number=${TRAVIS_BUILD_NUMBER}" \ --form "travis_build_number=${TRAVIS_BUILD_NUMBER}" \
--form "github_repo=${REPONAME}" \
--form "build_name=${BUILDNAME}" \
${PUBLISH_URL} ${PUBLISH_URL}
else else
make -j2 make -j2
fi fi
fi fi

View file

@ -6,8 +6,10 @@ targets=("PUBLISHMETA=True" "RUNTESTS=True" \
"TARGET=OLIMEXINO" "TARGET=PORT103R" "TARGET=SPARKY" "TARGET=STM32F3DISCOVERY" \ "TARGET=OLIMEXINO" "TARGET=PORT103R" "TARGET=SPARKY" "TARGET=STM32F3DISCOVERY" \
"TARGET=ALIENWIIF1" "TARGET=ALIENWIIF3") "TARGET=ALIENWIIF1" "TARGET=ALIENWIIF3")
#fake a travis build number #fake a travis build environment
export TRAVIS_BUILD_NUMBER=$(date +%s) export TRAVIS_BUILD_NUMBER=$(date +%s)
export BUILDNAME=fake_travis
export TRAVIS_REPO_SLUG=$USER/simulated
for target in "${targets[@]}" for target in "${targets[@]}"
do do
@ -16,6 +18,3 @@ do
make clean make clean
./.travis.sh ./.travis.sh
done done

View file

@ -1,4 +1,4 @@
<? <?php
// see docs/Travis.md, .travis.sh // see docs/Travis.md, .travis.sh
$baseDir = "/var/www/builds/"; $baseDir = "/var/www/builds/";
@ -12,8 +12,11 @@
$revision = sanitize($_POST["revision"]); $revision = sanitize($_POST["revision"]);
$branch = sanitize($_POST["branch"]); $branch = sanitize($_POST["branch"]);
$uploadDir = $baseDir . "/" . $lastCommitDate . "/"; $github_repo = sanitize($_POST["github_repo"]);
$prefix = $uploadDir . $travisJobId . "_" . $revision; $build_name = sanitize($_POST["build_name"]);
$uploadDir = $baseDir . "/" . $github_repo . "/" . $lastCommitDate . "/";
$prefix = $uploadDir . $travisJobId . "_" . $revision . "_" . $build_name;
if(!file_exists($uploadDir)) mkdir($uploadDir, 0770, true); if(!file_exists($uploadDir)) mkdir($uploadDir, 0770, true);