Parcourir la source

Patch mfqp for use directly with MarlinDocumentation

Scott Lahteine il y a 7 ans
Parent
révision
6c2e6ea38e
2 fichiers modifiés avec 16 ajouts et 3 suppressions
  1. 1
    1
      buildroot/share/git/mfdoc
  2. 15
    2
      buildroot/share/git/mfqp

+ 1
- 1
buildroot/share/git/mfdoc Voir le fichier

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

+ 15
- 2
buildroot/share/git/mfqp Voir le fichier

@@ -8,6 +8,10 @@
8 8
 MFINFO=$(mfinfo) || exit
9 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 15
 case "$#" in
12 16
   0 ) ;;
13 17
   * ) echo "Usage: `basename $0`" 1>&2 ; exit 1 ;;
@@ -15,5 +19,14 @@ esac
15 19
 
16 20
 git add * .travis.yml
17 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

Chargement…
Annuler
Enregistrer