Browse Source

For Travis CI - all bar none for Emscripten samples.
Adjust log messages for consistency sake.

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

+ 0 - 8
.travis.yml

@@ -352,14 +352,6 @@ script:
   - if [ $PACKAGE_UPLOAD ]; then rake ci_package_upload && rake ci_emscripten_samples_update || ! [ $RELEASE_TAG ]; fi
   - if [ $PACKAGE_UPLOAD ]; then rake ci_package_upload && rake ci_emscripten_samples_update || ! [ $RELEASE_TAG ]; fi
 after_script: rake ci_teardown_cache
 after_script: rake ci_teardown_cache
 
 
-# Below samples are excluded from Emscripten CI build due to build time constraint
-data:
-  excluded_sample:
-    - 01_HelloWorld
-    - 02_HelloGUI
-    - 26_ConsoleInput
-    - 29_SoundSynthesis
-
 ...
 ...
 
 
 # vi: set ts=2 sw=2 expandtab:
 # vi: set ts=2 sw=2 expandtab:

+ 3 - 2
Rakefile

@@ -288,6 +288,7 @@ end
 # Usage: NOT intended to be used manually
 # Usage: NOT intended to be used manually
 desc 'Update Emscripten HTML5 samples to GitHub Pages'
 desc 'Update Emscripten HTML5 samples to GitHub Pages'
 task :ci_emscripten_samples_update do
 task :ci_emscripten_samples_update do
+  puts "\nUpdating Emscripten samples in main website..."
   # Pull or clone
   # Pull or clone
   system 'cd ../doc-Build 2>/dev/null && git pull -q -r || git clone --depth 1 -q https://github.com/urho3d/urho3d.github.io.git ../doc-Build' or abort 'Failed to pull/clone'
   system 'cd ../doc-Build 2>/dev/null && git pull -q -r || git clone --depth 1 -q https://github.com/urho3d/urho3d.github.io.git ../doc-Build' or abort 'Failed to pull/clone'
   # Sync Emscripten samples
   # Sync Emscripten samples
@@ -348,7 +349,7 @@ task :ci_package_upload do
       ENV['SITE_UPDATE'] = nil
       ENV['SITE_UPDATE'] = nil
     end
     end
   else
   else
-    system 'echo Generate documentation'
+    system 'echo Generating documentation...'
     if ENV['XCODE']
     if ENV['XCODE']
       xcode_build(ENV['IOS'], '../Build/Urho3D.xcodeproj', 'doc', '>/dev/null') or abort 'Failed to generate documentation'
       xcode_build(ENV['IOS'], '../Build/Urho3D.xcodeproj', 'doc', '>/dev/null') or abort 'Failed to generate documentation'
     else
     else
@@ -364,7 +365,7 @@ task :ci_package_upload do
     end
     end
     if !ENV['CI_START_TIME'] || elapsed_time < 25 # minutes
     if !ENV['CI_START_TIME'] || elapsed_time < 25 # minutes
       # Build Mach-O universal binary consisting of iphoneos (universal ARM archs including 'arm64' if 64-bit is enabled) and iphonesimulator (i386 arch and also x86_64 arch if 64-bit is enabled)
       # Build Mach-O universal binary consisting of iphoneos (universal ARM archs including 'arm64' if 64-bit is enabled) and iphonesimulator (i386 arch and also x86_64 arch if 64-bit is enabled)
-      system 'echo Rebuild Urho3D library as Mach-O universal binary'
+      system 'echo Rebuilding Urho3D library as Mach-O universal binary...'
       xcode_build(0, '../Build/Urho3D.xcodeproj', 'Urho3D_universal') or abort 'Failed to build Mach-O universal binary'
       xcode_build(0, '../Build/Urho3D.xcodeproj', 'Urho3D_universal') or abort 'Failed to build Mach-O universal binary'
     end
     end
     # There is a bug in CMake/CPack that causes the 'package' target failed to build for IOS platform, workaround by calling cpack directly
     # There is a bug in CMake/CPack that causes the 'package' target failed to build for IOS platform, workaround by calling cpack directly