1 new commit in nvda-mrconfig:
https://bitbucket.org/nvdaaddonteam/nvda-mrconfig/commits/f92701cfd4ae/
Changeset: f92701cfd4ae
Branch: master
User: jteh
Date: 2017-09-01 03:37:36+00:00
Summary: addon2svn, svn2addon: Fetch and reset to origin/stable before
doing anything.
Previously, this relied on mr up being run earlier, but the way the cron jobs
are set up, that could have been hours before. That meant that someone might
have pushed something after we updated. This mitigates that for the most part.
Resetting rather than pulling ensures we always have the latest upstream, even
if there was a force push or a previous run failed in an unexpected state.
Affected #: 2 files
diff --git a/.sh.d/01_addon2svn.sh b/.sh.d/01_addon2svn.sh
index abb80f8..173ecde 100644
--- a/.sh.d/01_addon2svn.sh
+++ b/.sh.d/01_addon2svn.sh
@@ -23,6 +23,8 @@ addon2svn() {
git stash save "$datetime on $curBranch before switching to stable
branch"
fi
git checkout stable
+ git fetch
+ git reset --hard origin/stable
scons pot mergePot
cp *.pot /tmp/
diff --git a/.sh.d/01_svn2addon.sh b/.sh.d/01_svn2addon.sh
index f8cac85..40b4992 100644
--- a/.sh.d/01_svn2addon.sh
+++ b/.sh.d/01_svn2addon.sh
@@ -29,6 +29,8 @@ svn2addon() {
git stash save "$datetime on $curBranch before switching to stable
branch"
fi
git checkout stable
+ git fetch
+ git reset --hard origin/stable
cd $PATH2TOPDIR
ls -1 srt/*/add-ons/$addonName/nvda.po | while read srcFile; do
Repository URL: https://bitbucket.org/nvdaaddonteam/nvda-mrconfig/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
