mawei/onepilot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "build script", should've been on branch

Browse Source 
This reverts commit 66c6a7a32a4301a4599b119098f45da04dddee46.

old-commit-hash: 6b942c94deed1467458b510215e51e263b6ba1ad
This commit is contained in:
Adeeb Shihadeh
2020-07-06 20:16:16 -07:00
parent 466ed6ac10
commit b4978bafc9
2 changed files with 22 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
release/build_release2.sh
View File

@@ -8,45 +8,36 @@ export GIT_AUTHOR_EMAIL="user@comma.ai"
export GIT_SSH_COMMAND="ssh -i /data/gitkey"
# set CLEAN to build outside of CI
if [ ! -z "$CLEAN" ]; then
# Create folders
rm -rf /data/openpilot
mkdir -p /data/openpilot
cd /data/openpilot
# Create git repo
git init
git remote add origin git@github.com:commaai/openpilot.git
git fetch origin devel-staging
else
cd /data/openpilot
git clean -xdf
git branch -D release2-staging || true
fi
# Create folders
rm -rf /data/openpilot
mkdir -p /data/openpilot
cd /data/openpilot
# Create git repo
git init
git remote add origin git@github.com:commaai/openpilot.git
git fetch origin devel
git fetch origin release2-staging
git fetch origin dashcam-staging
# Checkout devel
#git checkout origin/devel
#git clean -xdf
# Create release2 with no history
if [ ! -z "$CLEAN" ]; then
git checkout --orphan release2-staging origin/devel-staging
else
git checkout --orphan release2-staging
fi
git checkout --orphan release2-staging origin/devel
VERSION=$(cat selfdrive/common/version.h | awk -F\" '{print $2}')
git commit -m "openpilot v$VERSION"
# Build signed panda firmware
pushd panda/board/
#cp -r /tmp/pandaextra /data/openpilot/
#RELEASE=1 make obj/panda.bin
make obj/panda.bin
cp -r /tmp/pandaextra /data/openpilot/
RELEASE=1 make obj/panda.bin
mv obj/panda.bin /tmp/panda.bin
make clean
mv /tmp/panda.bin obj/panda.bin.signed
#rm -rf /data/openpilot/pandaextra
rm -rf /data/openpilot/pandaextra
popd
# Build stuff
@@ -69,9 +60,6 @@ rm .sconsign.dblite
# Restore phonelibs
git checkout phonelibs/
# Remove the stuff needed to build release
rm -rf release/
# Mark as prebuilt release
touch prebuilt
@@ -82,17 +70,11 @@ git commit --amend -m "openpilot v$VERSION"
# Print committed files that are normally gitignored
#git status --ignored
if [ ! -z "$CI_PUSH" ]; then
git remote set-url origin git@github.com:commaai/openpilot.git
# Push to release2-staging
git push -f origin release2-staging
# Push to release2-staging
#git push -f origin release2-staging
git push -f origin release2-staging:r2_staging_test
# Create dashcam release
git rm selfdrive/car/*/carcontroller.py
# Create dashcam release
git rm selfdrive/car/*/carcontroller.py
git commit -m "create dashcam release from release2"
#git push -f origin release2-staging:dashcam-staging
git push -f origin release2-staging:d_staging_test
fi
git commit -m "create dashcam release from release2"
git push -f origin release2-staging:dashcam-staging