merge

.gitignore

@@ -2,4 +2,5 @@
 *.webm
 __pycache__/
 log/
-*.jld
+*.jld
+docs/build

.travis.yml

@@ -2,10 +2,10 @@
 language: julia
 os:
   - linux
-  - osx
+  # - osx
 julia:
-  - 0.7
   - 1.0
+  - 1.1
   - nightly
 notifications:
   email: false
@@ -21,16 +21,49 @@ addons:
  apt: # apt-get for linux
    packages:
    - libgtk-3-dev
-#before_script: # homebrew for mac
+# before_script: # homebrew for mac
 #  - if [ $TRAVIS_OS_NAME = osx ]; then brew install gcc; fi
 
 ## uncomment the following lines to override the default test script
 script:
+  - git clone https://github.com/JuliaRegistries/General  $(julia -e 'import Pkg; println(joinpath(Pkg.depots1(), "registries", "General"))')  
+  - git clone https://github.com/JuliaPOMDP/Registry  $(julia -e 'import Pkg; println(joinpath(Pkg.depots1(), "registries", "JuliaPOMDP"))')  
   - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
+<<<<<<< HEAD
   - julia --project --check-bounds=yes -e 'using Pkg; Pkg.add(PackageSpec(url="https://github.com/sisl/Vec.jl")); Pkg.add(PackageSpec(url="https://github.com/sisl/Records.jl"));'
   - julia --project --check-bounds=yes -e 'using Pkg; Pkg.add(PackageSpec(url="https://github.com/sisl/AutomotiveDrivingModels.jl"));  Pkg.add(PackageSpec(url="https://github.com/sisl/AutoViz.jl"));  Pkg.add(PackageSpec(url="https://github.com/JuliaPOMDP/RLInterface.jl")); '
   - julia --project --check-bounds=yes -e 'Pkg.build("AutomotivePOMDPs"); Pkg.test("AutomotivePOMDPs"; coverage=true)'
 
 after_success:
   - julia --project -e 'import Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
-  - julia --project -e 'import Pkg; Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
+  - julia --project -e 'import Pkg; Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
+=======
+  - julia --project --color=yes -e 'import Pkg; Pkg.build(); Pkg.test(coverage=true)'
+after_success:
+  # push coverage results to Coveralls
+  - julia -e 'cd(Pkg.dir("AutomotivePOMDPs")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
+  # push coverage results to Codecov
+  - julia -e 'cd(Pkg.dir("AutomotivePOMDPs")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
+jobs:
+  include:
+    - stage: "Documentation"
+      julia: 1.0
+      os: linux
+      script:
+        - julia --project=docs/ -e 'using Pkg;
+                                Pkg.add("Documenter"); 
+                                Pkg.add(PackageSpec(url="https://github.com/sisl/Records.jl")); 
+                                Pkg.add(PackageSpec(url="https://github.com/sisl/Vec.jl"));
+                                Pkg.add(PackageSpec(url="https://github.com/sisl/AutomotiveDrivingModels.jl"));
+                                Pkg.add(PackageSpec(url="https://github.com/sisl/AutoViz.jl"));
+                                Pkg.add(PackageSpec(url="https://github.com/sisl/AutoUrban.jl"));
+                                Pkg.add(PackageSpec(url="https://github.com/sisl/AutomotiveSensors.jl"));
+                                Pkg.add("POMDPs");
+                                using POMDPs;
+                                POMDPs.add_registry();
+                                Pkg.add(PackageSpec(url="https://github.com/sisl/AutomotivePOMDPs.jl"));
+                                Pkg.develop(PackageSpec(path=pwd()));
+                                Pkg.instantiate()'
+        - julia --project=docs/ docs/make.jl
+      after_success: skip
+>>>>>>> 09f2341a53620aaa0158b668569c2164cb6f684d