Browse Source

For Travis CI - setup build infra for test running Autobinder tool.
[ci only: Annotate]

Yao Wei Tjong 姚伟忠 10 years ago
parent
commit
e798ee4dcf
2 changed files with 3 additions and 3 deletions
  1. 1 1
      .travis.yml
  2. 2 2
      Rakefile

+ 1 - 1
.travis.yml

@@ -169,7 +169,7 @@ addons: {apt: {sources: [kubuntu-backports, ubuntu-toolchain-r-test], packages:
 env:
   global:
     - secure: DE9IUM+pIV757GU0ccfDJhA752442pKu3DyBthrzHW9+GbsqbfuJOx045CYNN5vOWutFPC0A51B9WxhLNpXXqD3mfU8MhP1gkF7SskrHvcAPrCyfdqZf1Q8XDP5phm2KbHhhwxQMYmmicd6yj8DPNy2wRoSgPSDp/ZUDk51XZDU=
-    - NUMJOBS=3
+    - NUMJOBS=4
     - USE_CCACHE=1
     - CCACHE_SLOPPINESS=pch_defines,time_macros
     - CCACHE_COMPRESS=1

+ 2 - 2
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 stash -q && git reset --hard HEAD~ && git stash pop -q && 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'
+  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 -q && git reset --hard HEAD~ && git stash pop -q && sed -i \"s/- USE_CCACHE/- URHO3D_BINDINGS=1\\n    - USE_CCACHE/g\" .travis.yml && git add -A .travis.yml Source/Urho3D && git commit -qm 'Result of annotate rake task. [ci only: annotated]' && 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)
@@ -233,7 +233,7 @@ task :ci do
   $build_options = "-DEMSCRIPTEN=#{ENV['HTML5']}" if ENV['HTML5']
   $build_options = "#{$build_options} -DANDROID_ABI=#{ENV['ABI']}" if ENV['ABI']
   $build_options = "#{$build_options} -DANDROID_NATIVE_API_LEVEL=#{ENV['API']}" if ENV['API']
-  ['URHO3D_64BIT', 'URHO3D_LIB_TYPE', 'URHO3D_OPENGL', 'URHO3D_D3D11', 'URHO3D_TEST_TIMEOUT', 'ANDROID', 'RPI', 'RPI_ABI', 'EMSCRIPTEN_SHARE_DATA', 'EMSCRIPTEN_EMRUN_BROWSER'].each { |var| $build_options = "#{$build_options} -D#{var}=#{ENV[var]}" if ENV[var] }
+  ['URHO3D_64BIT', 'URHO3D_LIB_TYPE', 'URHO3D_BINDINGS', 'URHO3D_OPENGL', 'URHO3D_D3D11', 'URHO3D_TEST_TIMEOUT', 'ANDROID', 'RPI', 'RPI_ABI', 'EMSCRIPTEN_SHARE_DATA', 'EMSCRIPTEN_EMRUN_BROWSER'].each { |var| $build_options = "#{$build_options} -D#{var}=#{ENV[var]}" if ENV[var] }
   if ENV['XCODE']
     # xcodebuild
     xcode_ci