Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/release-1.7.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffamstutz committed Oct 25, 2018
2 parents 7fea5a0 + 7df9111 commit 8cef37b
Show file tree
Hide file tree
Showing 25 changed files with 317 additions and 195 deletions.
21 changes: 9 additions & 12 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,7 @@ variables:
tags:
- docker
script:
- cd $CI_PROJECT_DIR/build
- make ospray_test_data
- ../scripts/tests/run_tests.sh
- scripts/tests/run_tests.sh
artifacts:
paths:
- $CI_PROJECT_DIR/build/tests.xml
Expand Down Expand Up @@ -173,7 +171,8 @@ build-windows-msvc14:
- win7
artifacts:
paths:
- build
- build/Release
- build/regression_tests
expire_in: 3 day

build-windows-msvc15:
Expand All @@ -185,7 +184,8 @@ build-windows-msvc15:
- win7
artifacts:
paths:
- build
- build/Release
- build/regression_tests
expire_in: 3 day

build-windows-icc:
Expand All @@ -197,7 +197,8 @@ build-windows-icc:
- win7
artifacts:
paths:
- build
- build/Release
- build/regression_tests
expire_in: 3 day

build-scan-kw:
Expand Down Expand Up @@ -245,19 +246,15 @@ test-ubuntu1404-gcc:
<<: *test_job
image: ospray/docker-images:ubuntu14.04
script:
- cd $CI_PROJECT_DIR/build
- make ospray_test_data
- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib64/ ../scripts/tests/run_tests.sh
- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib64/ scripts/tests/run_tests.sh
dependencies:
- build-ubuntu1404-gcc

test-ubuntu1604-gcc:
<<: *test_job
image: ospray/docker-images:ubuntu16.04
script:
- cd $CI_PROJECT_DIR/build
- make ospray_test_data
- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib64/ ../scripts/tests/run_tests.sh
- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib64/ scripts/tests/run_tests.sh
dependencies:
- build-ubuntu1604-gcc

Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
Version History
---------------

### Changes in v1.7.1:

- Fixed issue where the `Principled` material would somtimes show up
incorrectly as black
- Fixed issue where some headers were missing from install packages

### Changes in v1.7.0:

- Generalized texture interface to support more than classic 2D image
Expand Down
Loading

0 comments on commit 8cef37b

Please sign in to comment.