Skip to content

Commit 58fe6b0

Browse files
committed
Travis: make sure to test against all of OIIO 1.8, 2.0, 2.1, 2.2
Signed-off-by: Larry Gritz <[email protected]>
1 parent b0cf21d commit 58fe6b0

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

.travis.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ branches:
107107
matrix:
108108
fast_finish: true
109109
include:
110-
- name: "VFX Platform 2018 (gcc6, c++14), llvm 7, OIIO release, avx/f16c"
110+
- name: "VFX Platform 2018 (gcc6, c++14), llvm 7, OIIO 2.1, avx/f16c"
111111
os: linux
112112
compiler: gcc
113113
addons:
@@ -122,7 +122,7 @@ matrix:
122122
- libboost-system1.55
123123
- libboost-thread1.55
124124
- libboost-wave1.55
125-
env: WHICHGCC=6 USE_CPP=14 LLVM_VERSION=7.0.0 OIIOBRANCH=release USE_SIMD=avx,f16c BUILD_CMAKE=1
125+
env: WHICHGCC=6 USE_CPP=14 LLVM_VERSION=7.0.0 OIIOBRANCH=Release-2.1.18.0 USE_SIMD=avx,f16c BUILD_CMAKE=1
126126
- name: "MacOS (latest Apple clang, llvm 10, OIIO master, latest homebrew libs"
127127
os: osx
128128
compiler: clang
@@ -142,7 +142,7 @@ matrix:
142142
- libboost-system1.55
143143
- libboost-thread1.55
144144
- libboost-wave1.55
145-
env: WHICHGCC=4.8 USE_CPP=11 LLVM_VERSION=6.0.1 USE_SIMD=sse4.2 OIIOBRANCH=RB-2.0
145+
env: WHICHGCC=4.8 USE_CPP=11 LLVM_VERSION=6.0.1 USE_SIMD=sse4.2 OIIOBRANCH=Release-2.0.14
146146
- name: "Older things: llvm 5, OIIO 1.8/oldest, boost 1.55"
147147
os: linux
148148
compiler: gcc
@@ -160,7 +160,7 @@ matrix:
160160
- libboost-wave1.55
161161
env: WHICHGCC=4.8 USE_CPP=11 LLVM_VERSION=5.0.0 USE_SIMD=sse4.2 OIIOBRANCH=Release-1.8.17
162162
if: branch =~ /(master|RB|travis)/ OR type = pull_request
163-
- name: "gcc7, llvm7, C++11"
163+
- name: "gcc7, llvm7, C++11, OIIO 2.1"
164164
os: linux
165165
compiler: gcc
166166
addons:
@@ -175,9 +175,9 @@ matrix:
175175
- libboost-system1.55
176176
- libboost-thread1.55
177177
- libboost-wave1.55
178-
env: WHICHGCC=7 USE_CPP=11 LLVM_VERSION=7.0.0 BUILD_CMAKE=1
178+
env: WHICHGCC=7 USE_CPP=11 LLVM_VERSION=7.0.0 BUILD_CMAKE=1 OIIOBRANCH=RB-2.1
179179
if: branch =~ /(master|RB|travis)/ OR type = pull_request
180-
- name: "Future: gcc8, C++14, LLVM 8, OIIO master, AVX/f16c"
180+
- name: "Future: gcc8, C++14, LLVM 8, OIIO 2.2, AVX/f16c"
181181
os: linux
182182
compiler: gcc
183183
addons:
@@ -192,8 +192,8 @@ matrix:
192192
- libboost-system1.55
193193
- libboost-thread1.55
194194
- libboost-wave1.55
195-
env: WHICHGCC=8 USE_CPP=14 LLVM_VERSION=8.0.0 USE_SIMD=avx,f16c BUILD_CMAKE=1
196-
- name: "DEBUG build, LLVM 7, OIIO release"
195+
env: WHICHGCC=8 USE_CPP=14 LLVM_VERSION=8.0.0 USE_SIMD=avx,f16c BUILD_CMAKE=1 OIIOBRANCH=RB-2.2
196+
- name: "DEBUG build, LLVM 7, OIIO 2.2"
197197
os: linux
198198
compiler: gcc
199199
addons:
@@ -208,7 +208,7 @@ matrix:
208208
- libboost-system1.55
209209
- libboost-thread1.55
210210
- libboost-wave1.55
211-
env: DEBUG=1 LLVM_VERSION=7.0.0 OIIOBRANCH=release BUILD_CMAKE=1
211+
env: DEBUG=1 LLVM_VERSION=7.0.0 OIIOBRANCH=RB-2.2 BUILD_CMAKE=1
212212
- name: "Oldest everything: LLVM 4, OIIO 1.8, no simd"
213213
os: linux
214214
compiler: gcc

0 commit comments

Comments
 (0)