Selaa lähdekoodia

For Travis CI - do not include fastcomp-clang as subtree.
[ci only: Annotate]

Yao Wei Tjong 姚伟忠 10 vuotta sitten
vanhempi
sitoutus
39eed8a481
1 muutettua tiedostoa jossa 1 lisäystä ja 1 poistoa
  1. 1 1
      Rakefile

+ 1 - 1
Rakefile

@@ -198,7 +198,7 @@ end
 desc 'Build and run the annotate migration tool'
 task :ci_annotate do
   system 'rake cmake URHO3D_CLANG_TOOLS=1 && rake make annotate' or abort 'Failed to annotate'
-  system "git config user.name $GIT_NAME && git config user.email $GIT_EMAIL && git remote set-url --push origin https://[email protected]/$TRAVIS_REPO_SLUG.git && if git fetch origin annotated:annotated 2>/dev/null; then git push -qf origin --delete annotated; fi && git checkout -B annotated && git add -A . && git commit -qm 'Result of annotate rake task. [ci skip]' && git push -qf -u origin annotated >/dev/null 2>&1" or abort 'Failed to push annotated branch'
+  system "git config user.name $GIT_NAME && git config user.email $GIT_EMAIL && git remote set-url --push origin https://[email protected]/$TRAVIS_REPO_SLUG.git && if git fetch origin annotated:annotated 2>/dev/null; then git push -qf origin --delete annotated; fi && git checkout -B annotated && git stash && git reset --hard HEAD~ && git stash pop && git add -A Source/Urho3D && git commit -qm 'Result of annotate rake task. [ci skip]' && git push -qf -u origin annotated >/dev/null 2>&1" or abort 'Failed to push annotated branch'
 end
 
 # Usage: NOT intended to be used manually (if you insist then try: rake ci)