From ce57a3603c33a215f098c39024a2b10e901cf643 Mon Sep 17 00:00:00 2001 From: Christina Tempelaar-Lietz Date: Fri, 30 Jun 2023 16:43:55 -0500 Subject: [PATCH] Update CI with vfx2023 Linux jobs. Signed-off-by: Christina Tempelaar-Lietz --- .github/workflows/ci_workflow.yml | 109 ++++++++++-------------------- 1 file changed, 35 insertions(+), 74 deletions(-) diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml index 596eaac43a..d334178ed3 100644 --- a/.github/workflows/ci_workflow.yml +++ b/.github/workflows/ci_workflow.yml @@ -59,11 +59,11 @@ jobs: image: aswf/ci-openexr:${{ matrix.vfx-cy }} strategy: matrix: - build: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13] + build: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] include: # ------------------------------------------------------------------- - # VFX CY2022 - GCC + # VFX CY2023 - GCC # ------------------------------------------------------------------- # Shared, Release - build: 1 @@ -72,10 +72,10 @@ jobs: cxx-standard: 17 cxx-compiler: g++ cc-compiler: gcc - compiler-desc: gcc9.3.1 + compiler-desc: gcc11.2.1 label: threads-enabled: 'ON' - vfx-cy: 2022 + vfx-cy: 2023 exclude-tests: # Shared, Release, Threads OFF @@ -85,10 +85,10 @@ jobs: cxx-standard: 17 cxx-compiler: g++ cc-compiler: gcc - compiler-desc: gcc9.3.1 + compiler-desc: gcc11.2.1 label: threads-enabled: 'OFF' - vfx-cy: 2022 + vfx-cy: 2023 exclude-tests: # Shared, Debug @@ -98,10 +98,10 @@ jobs: cxx-standard: 17 cxx-compiler: g++ cc-compiler: gcc - compiler-desc: gcc9.3.1 + compiler-desc: gcc11.2.1 label: threads-enabled: 'ON' - vfx-cy: 2022 + vfx-cy: 2023 exclude-tests: # Static, Release @@ -111,27 +111,27 @@ jobs: cxx-standard: 17 cxx-compiler: g++ cc-compiler: gcc - compiler-desc: gcc9.3.1 + compiler-desc: gcc11.2.1 label: threads-enabled: 'ON' - vfx-cy: 2022 + vfx-cy: 2023 exclude-tests: - # Static, Debug + # Shared, Release, C++14 - build: 5 - build-type: Debug - build-shared: 'OFF' - cxx-standard: 17 + build-type: Release + build-shared: 'ON' + cxx-standard: 14 cxx-compiler: g++ cc-compiler: gcc - compiler-desc: gcc9.3.1 + compiler-desc: gcc11.2.1 label: threads-enabled: 'ON' - vfx-cy: 2022 + vfx-cy: 2023 exclude-tests: # ------------------------------------------------------------------- - # VFX CY2021 - Clang + # VFX CY2023 - Clang 15.0 # ------------------------------------------------------------------- # Release - build: 6 @@ -140,46 +140,39 @@ jobs: cxx-standard: 17 cxx-compiler: clang++ cc-compiler: clang - compiler-desc: clang10 + compiler-desc: clang15.0 label: threads-enabled: 'ON' - vfx-cy: 2022 + vfx-cy: 2023 exclude-tests: - # Debug + # ------------------------------------------------------------------- + # VFX CY2023 - Clang 14.0 + # ------------------------------------------------------------------- + # Release - build: 7 - build-type: Debug + build-type: Release build-shared: 'ON' cxx-standard: 17 cxx-compiler: clang++ cc-compiler: clang - compiler-desc: clang10 + compiler-desc: clang14.0 label: threads-enabled: 'ON' - vfx-cy: 2022 + vfx-cy: 2023 exclude-tests: - # Static, Release + # ------------------------------------------------------------------- + # VFX CY2022 - GCC, Release + # ------------------------------------------------------------------- + # Shared, Release - build: 8 build-type: Release build-shared: 'ON' cxx-standard: 17 - cxx-compiler: clang++ - cc-compiler: clang - compiler-desc: clang10 - label: - threads-enabled: 'ON' - vfx-cy: 2022 - exclude-tests: - - # Static, Debug - - build: 9 - build-type: Debug - build-shared: 'OFF' - cxx-standard: 17 - cxx-compiler: clang++ - cc-compiler: clang - compiler-desc: clang10 + cxx-compiler: g++ + cc-compiler: gcc + compiler-desc: gcc9.3.1 label: threads-enabled: 'ON' vfx-cy: 2022 @@ -189,7 +182,7 @@ jobs: # VFX CY2021 - GCC, Release # ------------------------------------------------------------------- # Shared, Release - - build: 10 + - build: 9 build-type: Release build-shared: 'ON' cxx-standard: 17 @@ -205,7 +198,7 @@ jobs: # VFX CY2020 - GCC, Release # ------------------------------------------------------------------- # Shared, Release - - build: 11 + - build: 10 build-type: Release build-shared: 'ON' cxx-standard: 14 @@ -217,38 +210,6 @@ jobs: vfx-cy: 2020 exclude-tests: - # ------------------------------------------------------------------- - # VFX CY2019 - GCC, Release - # ------------------------------------------------------------------- - # Shared, Release - - build: 12 - build-type: Release - build-shared: 'ON' - cxx-standard: 14 - cxx-compiler: g++ - cc-compiler: gcc - compiler-desc: gcc6.3.1 - label: - threads-enabled: 'ON' - vfx-cy: 2019 - exclude-tests: - - # ------------------------------------------------------------------- - # Legacy - VFX CY2019 - C++11 - # ------------------------------------------------------------------- - # Shared, Release - - build: 13 - build-type: Release - build-shared: 'ON' - cxx-standard: 11 - cxx-compiler: g++ - cc-compiler: gcc - compiler-desc: gcc6.3.1 - label: 'Legacy ' - threads-enabled: 'ON' - vfx-cy: 2019 - exclude-tests: - env: CXX: ${{ matrix.cxx-compiler }} CC: ${{ matrix.cc-compiler }}