Merge remote-tracking branch 'upstream/RB-3.1' into RB-3.1

.github/workflows/ci_workflow.yml

@@ -47,7 +47,8 @@ jobs:
        C++${{ matrix.cxx-standard }},
        config=${{ matrix.build-type }},
        shared=${{ matrix.build-shared }},
-       threads=${{ matrix.threads-enabled }}>'
+       threads=${{ matrix.threads-enabled }},
+       docs=${{ matrix.build-docs }}>'
     # GH-hosted VM. The build runs in CentOS 7 'container' defined below.
     runs-on: ubuntu-latest
     container:
@@ -73,6 +74,7 @@ jobs:
             label: 
             threads-enabled: 'ON'
             vfx-cy: 2022
+            build-docs: 'ON'
             exclude-tests:
 
           # Shared, Release, Threads OFF
@@ -86,6 +88,7 @@ jobs:
             label: 
             threads-enabled: 'OFF'
             vfx-cy: 2022
+            build-docs: 'OFF'
             exclude-tests:
 
           # Shared, Debug
@@ -99,6 +102,7 @@ jobs:
             label: 
             threads-enabled: 'ON'
             vfx-cy: 2022
+            build-docs: 'OFF'
             exclude-tests:
 
           # Static, Release
@@ -112,6 +116,7 @@ jobs:
             label: 
             threads-enabled: 'ON'
             vfx-cy: 2022
+            build-docs: 'OFF'
             exclude-tests:
 
           # Static, Debug
@@ -125,6 +130,7 @@ jobs:
             label: 
             threads-enabled: 'ON'
             vfx-cy: 2022
+            build-docs: 'OFF'
             exclude-tests:
 
           # -------------------------------------------------------------------
@@ -141,6 +147,7 @@ jobs:
             label: 
             threads-enabled: 'ON'
             vfx-cy: 2022
+            build-docs: 'OFF'
             exclude-tests:
 
           # Debug
@@ -154,6 +161,7 @@ jobs:
             label: 
             threads-enabled: 'ON'
             vfx-cy: 2022
+            build-docs: 'OFF'
             exclude-tests:
 
           # Static, Release
@@ -167,6 +175,7 @@ jobs:
             label: 
             threads-enabled: 'ON'
             vfx-cy: 2022
+            build-docs: 'OFF'
             exclude-tests:
 
           # Static, Debug
@@ -179,6 +188,7 @@ jobs:
             compiler-desc: clang10
             label: 
             threads-enabled: 'ON'
+            build-docs: 'OFF'
             vfx-cy: 2022
             exclude-tests:
 
@@ -195,6 +205,7 @@ jobs:
             compiler-desc: gcc9.3.1
             label: 
             threads-enabled: 'ON'
+            build-docs: 'OFF'
             vfx-cy: 2021
             exclude-tests:
 
@@ -211,6 +222,7 @@ jobs:
             compiler-desc: gcc6.3.1
             label: 
             threads-enabled: 'ON'
+            build-docs: 'OFF'
             vfx-cy: 2020
             exclude-tests:
 
@@ -227,6 +239,7 @@ jobs:
             compiler-desc: gcc6.3.1
             label: 
             threads-enabled: 'ON'
+            build-docs: 'OFF'
             vfx-cy: 2019
             exclude-tests: 
 
@@ -243,6 +256,7 @@ jobs:
             compiler-desc: gcc6.3.1
             label: 'Legacy '
             threads-enabled: 'ON'
+            build-docs: 'OFF'
             vfx-cy: 2019
             exclude-tests:
 
@@ -257,6 +271,9 @@ jobs:
           mkdir _install
           mkdir _build
           mkdir _examples
+      - name: Install docs env
+        run: share/ci/scripts/linux/yum/install_docs_env.sh
+        if: matrix.build-docs == 'ON'
       - name: Configure
         run: |
           cmake .. \
@@ -266,6 +283,7 @@ jobs:
                 -DCMAKE_CXX_FLAGS=${{ matrix.cxx-flags }} \
                 -DCMAKE_VERBOSE_MAKEFILE:BOOL='OFF' \
                 -DBUILD_SHARED_LIBS=${{ matrix.build-shared }} \
+                -DBUILD_DOCS=${{ matrix.build-docs }} \
                 -DOPENEXR_BUILD_TOOLS='ON' \
                 -DOPENEXR_RUN_FUZZ_TESTS='OFF' \
                 -DOPENEXR_ENABLE_THREADING=${{ matrix.threads-enabled }}
@@ -292,7 +310,7 @@ jobs:
           cmake --build . \
                 --config ${{ matrix.build-type }}
           # Confirm the examples program runs
-          ./OpenEXRExamples
+          ./bin/OpenEXRExamples
         working-directory: _examples
       - name: Test
         run: |
@@ -392,7 +410,7 @@ jobs:
           cmake --build . \
                 --config ${{ matrix.build-type }}
           # Confirm the examples program runs
-          ./OpenEXRExamples
+          ./bin/OpenEXRExamples
         working-directory: _examples
       - name: Test
         run: |
@@ -517,7 +535,7 @@ jobs:
       ##    cmake --build . \
       ##          --config ${{ matrix.build-type }}
       ##    # Confirm the examples program runs
-      ##    ./OpenEXRExamples
+      ##    ./bin/OpenEXRExamples
       ##  shell: bash
       ##  working-directory: _examples
       - name: Test

.github/workflows/cifuzz.yml

@@ -0,0 +1,26 @@
+name: CIFuzz
+on: [pull_request]
+jobs:
+  Fuzzing:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Build Fuzzers
+      id: build
+      uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
+      with:
+        oss-fuzz-project-name: 'openexr'
+        dry-run: false
+        language: c++
+    - name: Run Fuzzers
+      uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
+      with:
+        oss-fuzz-project-name: 'openexr'
+        fuzz-seconds: 300
+        dry-run: false
+        language: c++
+    - name: Upload Crash
+      uses: actions/upload-artifact@v3
+      if: failure() && steps.build.outcome == 'success'
+      with:
+        name: artifacts
+        path: ./out/artifacts

.gitignore

@@ -49,3 +49,4 @@ build/
 build-win/
 build-nuget/
 *~
+.vscode