Skip to content

Commit 1602f4c

Browse files
committed
Bump some CI versions and prepare release 1.11.15.0
Signed-off-by: Larry Gritz <[email protected]>
1 parent c3d0283 commit 1602f4c

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,9 @@ jobs:
179179
CMAKE_CXX_STANDARD: 17
180180
PYTHON_VERSION: 3.9
181181
USE_SIMD: avx2,f16c
182+
OPENCOLORIO_VERSION: v2.1.0
182183
OPENEXR_VERSION: v3.1.1
183-
OPENIMAGEIO_VERSION: dev-2.3
184+
OPENIMAGEIO_VERSION: release
184185
PYBIND11_VERSION: v2.7.1
185186
steps:
186187
- uses: actions/checkout@v2
@@ -471,7 +472,7 @@ jobs:
471472
linux-latest-release:
472473
# Test against development master for relevant dependencies, latest
473474
# supported releases of everything else.
474-
name: "Linux latest releases: gcc10/C++17, llvm12, oiio-master, py3.8, boost1.71, exr3.1, ocio2.0, avx2"
475+
name: "Linux latest releases: gcc10/C++17, llvm12, oiio-2.3, py3.8, boost1.71, exr3.1, ocio2.1, avx2"
475476
runs-on: ubuntu-20.04
476477
env:
477478
CXX: g++-10
@@ -481,9 +482,9 @@ jobs:
481482
LLVM_DISTRO_NAME: ubuntu-20.04
482483
USE_SIMD: avx2,f16c
483484
OPENEXR_VERSION: v3.1.0
484-
OPENIMAGEIO_VERSION: master
485+
OPENIMAGEIO_VERSION: release
485486
OPENIMAGEIO_CMAKE_FLAGS: -DBUILD_FMT_VERSION=8.0.0
486-
OPENCOLORIO_VERSION: v2.0.1
487+
OPENCOLORIO_VERSION: v2.1.0
487488
PUGIXML_VERSION: v1.11.4
488489
PYBIND11_VERSION: v2.7.1
489490
PYTHON_VERSION: 3.8

CHANGES.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
<!-- SPDX-License-Identifier: CC-BY-4.0 -->
22
<!-- Copyright Contributors to the Open Shading Language Project. -->
33

4+
Release 1.11.15.0 -- 1 Sep 2021 (compared to 1.11.14.2)
5+
-------------------------------------------------------
6+
* Changes for compatibility with OpenImageIO 2.3. #1393 #1388
7+
* Fix potential crashes (or at least undefined behavior) due to missing
8+
virtual destructor of internal Symbol type. #1397
9+
410
Release 1.11.14.2 -- 1 Jul 2021 (compared to 1.11.14.1)
511
-------------------------------------------------------
612
* Fix warnings that occur when compiling with clang and C++17 mode. #1379

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# https://github.com/AcademySoftwareFoundation/OpenShadingLanguage
44

55
cmake_minimum_required (VERSION 3.12)
6-
project (OSL VERSION 1.11.14.2
6+
project (OSL VERSION 1.11.15.0
77
LANGUAGES CXX C
88
HOMEPAGE_URL "https://github.com/AcademySoftwareFoundation/OpenShadingLanguage")
99
set (PROJ_NAME ${PROJECT_NAME}) # short name

0 commit comments

Comments
 (0)