Skip to content

Commit

Permalink
Fixes for Travis
Browse files Browse the repository at this point in the history
  • Loading branch information
scurest committed Feb 10, 2019
1 parent 7c4023b commit cf24beb
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 6 deletions.
20 changes: 15 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,24 @@ language: python
python:
"3.5"

# From michaeldegroot/cats-blender-plugin
before_install:
- sudo apt-get update -qq
# install blender from official sources.
# This will most propably install an outdated blender version,
# but it will resolve all system dependencies blender has to be able to run.
- sudo apt-get install blender

install:
- sudo add-apt-repository -y ppa:thomas-schiex/blender
- sudo apt-get update
- sudo apt-get install -y --allow-unauthenticated blender
- blender --version
# Then update blender
- mkdir tmp && cd tmp
- wget http://mirror.cs.umn.edu/blender.org/release/Blender2.79/blender-2.79-linux-glibc219-x86_64.tar.bz2
- tar jxf blender-2.79-linux-glibc219-x86_64.tar.bz2
- mv blender-2.79-linux-glibc219-x86_64 blender
- cd ..

script:
python test/test.py run
python test/test.py run --exe ./tmp/blender/blender

#deploy:
# provider: pages
Expand Down
4 changes: 4 additions & 0 deletions test/bl_generate_report.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,13 @@
import json
import os
from timeit import default_timer as timer
import sys

import bpy

print('bpy.app.version:', bpy.app.version)
print('python sys.version:', sys.version)

base_dir = os.path.dirname(os.path.abspath(__file__))
samples_path = os.path.join(base_dir, 'glTF-Sample-Models', '2.0')
site_local_path = os.path.join(base_dir, 'site_local')
Expand Down
2 changes: 1 addition & 1 deletion test/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ def cmd_report_times(args=None):


p = argparse.ArgumentParser(description='glTF importer tests')
subs = p.add_subparsers(title='subcommands', required=True)
subs = p.add_subparsers(title='subcommands')

run = subs.add_parser('run', help='Run tests and generate report')
run.add_argument('--exe', default='blender', help='Blender executable')
Expand Down

0 comments on commit cf24beb

Please sign in to comment.