From 6dd7dc34461f32bffa3bb643545347007ecc7aa5 Mon Sep 17 00:00:00 2001 From: Willem Melching Date: Sun, 19 Jan 2020 10:01:11 -0800 Subject: [PATCH] installer: add reset to make sure latest is checked out if branch doesnt change old-commit-hash: 53d997594780228ad039e049511f9d5f6b6d3c20 --- installer/installer.c | 2 ++ installer/installers/installer_dashcam | 2 +- installer/installers/installer_openpilot | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/installer/installer.c b/installer/installer.c index cdfa440b9c..34eacbc65f 100644 --- a/installer/installer.c +++ b/installer/installer.c @@ -68,6 +68,8 @@ static int use_pre_checkout() { if(err) return 1; err = system("git checkout " BRANCH_S); if(err) return 1; + err = system("git reset --hard origin/" BRANCH_S); + if(err) return 1; // Move to final location err = system("mv /tmp/openpilot /data"); diff --git a/installer/installers/installer_dashcam b/installer/installers/installer_dashcam index 1560d9704a..a5683d0f3d 100755 --- a/installer/installers/installer_dashcam +++ b/installer/installers/installer_dashcam @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb1c814cc3273badbb59c768c58219d78b1df65c11bd7d5828dc9940d0e6d788 +oid sha256:0ca0e294eca65b0c787c9f64ff1c05481e56b5ee6a14fd3996d91db96a39d249 size 538912 diff --git a/installer/installers/installer_openpilot b/installer/installers/installer_openpilot index 68c9ba5519..251baff37b 100755 --- a/installer/installers/installer_openpilot +++ b/installer/installers/installer_openpilot @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:129f7dbb9afe7f9187f6ebd8cafc25efe3782b60460f98ac11235778b85bb57d +oid sha256:009e09b2d145e1bbeadf426ad669ae505bb659fa489c9724b288d8458da65819 size 538912