Kaynağa Gözat

Patch mfqp for use directly with MarlinDocumentation

Scott Lahteine 8 yıl önce
ebeveyn
işleme
6c2e6ea38e
2 değiştirilmiş dosya ile 16 ekleme ve 3 silme
  1. 1
    1
      buildroot/share/git/mfdoc
  2. 15
    2
      buildroot/share/git/mfqp

+ 1
- 1
buildroot/share/git/mfdoc Dosyayı Görüntüle

37
 echo "Previewing MarlinDocumentation..."
37
 echo "Previewing MarlinDocumentation..."
38
 
38
 
39
 # wait to open the url for about 8s
39
 # wait to open the url for about 8s
40
-( sleep 8; opensite ) &
40
+( sleep 45; opensite ) &
41
 
41
 
42
 bundle exec jekyll serve --watch --incremental
42
 bundle exec jekyll serve --watch --incremental
43
 
43
 

+ 15
- 2
buildroot/share/git/mfqp Dosyayı Görüntüle

8
 MFINFO=$(mfinfo) || exit
8
 MFINFO=$(mfinfo) || exit
9
 IFS=' ' read -a INFO <<< "$MFINFO"
9
 IFS=' ' read -a INFO <<< "$MFINFO"
10
 
10
 
11
+if [[ ${INFO[4]} == "(no" ]]; then
12
+  echo "Branch is unavailable!" ; exit 1
13
+fi
14
+
11
 case "$#" in
15
 case "$#" in
12
   0 ) ;;
16
   0 ) ;;
13
   * ) echo "Usage: `basename $0`" 1>&2 ; exit 1 ;;
17
   * ) echo "Usage: `basename $0`" 1>&2 ; exit 1 ;;
15
 
19
 
16
 git add * .travis.yml
20
 git add * .travis.yml
17
 git commit -m "patch"
21
 git commit -m "patch"
18
-mfrb
19
-git push -f
22
+
23
+if [[ ${INFO[3]} == ${INFO[4]} ]]; then
24
+  if [[ ${INFO[2]} == "MarlinDocumentation" ]]; then
25
+    git rebase -i HEAD~2
26
+  else
27
+    echo "Don't alter the PR target branch."; exit 1
28
+  fi
29
+else
30
+  mfrb
31
+  git push -f
32
+fi

Loading…
İptal
Kaydet