Skip to content

Commit 119d352

Browse files
committed
fix git fetch error
1 parent 08fed23 commit 119d352

1 file changed

Lines changed: 11 additions & 9 deletions

File tree

local_deploy.sh

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
# runs only on haba's deploy:
77
type -p afslog > /dev/null && afslog
8+
type -p klist > /dev/null && klist
9+
test -f `echo $KRB5CCNAME | sed s/FILE://1` && ls -l `echo $KRB5CCNAME | sed s/FILE://1`
810

911
# here is the real start
1012
##########################
@@ -18,22 +20,22 @@ fi
1820

1921
# activate prepared venv
2022
. venv/bin/activate
23+
set -x
24+
while sleep 60 && touch ../run/timestamp; do
2125

22-
while sleep 1; do
26+
git fetch --dry-run 2>&1 | cut -c 26- | awk ' $2 == "->" && $1 != "gh-pages" { print "touch ../branch/"$1"/update-me"}' | bash
2327

24-
git fetch --dry-run 2>&1 | awk ' $4 != "" { print "touch ../branch/"$2"/update-me"}' | bash
25-
26-
for DIR in ../branch/*/update-me ; do
28+
for DIR in `ls -d ../branch/*/update-me 2>/dev/null` ; do
2729
BRANCH=`echo $DIR | awk -F/ '{print $3}'`
2830
#BRANCH=`git branch | egrep '^\*' | sed 's/. //1'`
29-
git checkout "$BRANCH"
30-
git pull
31-
pip3 install -r requirements.txt || exit 255
32-
sphinx-build -M html docs/. "../branch/$BRANCH/" -W --keep-going 2>&1 | cat > "../branch/$BRANCH/lastrun.log"
31+
git checkout "$BRANCH" 2>&1 | cat > "../branch/$BRANCH/lastrun.log"
32+
git pull 2>&1 | cat >> "../branch/$BRANCH/lastrun.log"
33+
pip3 install -r requirements.txt 2>&1 | cat >> "../branch/$BRANCH/lastrun.log"
34+
sphinx-build -M html docs/. "../branch/$BRANCH/" -W --keep-going --write-all --fresh-env 2>&1 | cat >> "../branch/$BRANCH/lastrun.log"
3335
rm "../branch/$BRANCH/update-me"
3436
done
3537
# still in testing, break here
36-
break
38+
# break
3739
done
3840

3941
#deactivate venv

0 commit comments

Comments
 (0)