Skip to content

Commit

Permalink
Update CI workflow to 2024 images.
Browse files Browse the repository at this point in the history 
Signed-off-by: Christina Tempelaar-Lietz <xlietz@gmail.com>
  • Loading branch information
@xlietz
xlietz committed May 6, 2024
1 parent 1b2b788 commit 10c1d32
Showing 1 changed file with 57 additions and 27 deletions.
84 changes: 57 additions & 27 deletions .github/workflows/ci_workflow.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,10 @@ jobs:
image: aswf/ci-openexr:${{ matrix.vfx-cy }}
strategy:
matrix:
build: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
build: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
include:

# -------------------------------------------------------------------
# VFX CY2023 - GCC
# VFX CY2024 - GCC
# -------------------------------------------------------------------
# Shared, Release
- build: 1
Expand All @@ -85,7 +84,7 @@ jobs:
compiler-desc: gcc11.2.1
label:
threads-enabled: 'ON'
vfx-cy: 2023
vfx-cy: 2024
exclude-tests:

# Shared, Release, Threads OFF
Expand All @@ -98,7 +97,7 @@ jobs:
compiler-desc: gcc11.2.1
label:
threads-enabled: 'OFF'
vfx-cy: 2023
vfx-cy: 2024
exclude-tests:

# Shared, Debug
Expand All @@ -111,7 +110,7 @@ jobs:
compiler-desc: gcc11.2.1
label:
threads-enabled: 'ON'
vfx-cy: 2023
vfx-cy: 2024
exclude-tests:

# Static, Release
Expand All @@ -124,7 +123,7 @@ jobs:
compiler-desc: gcc11.2.1
label:
threads-enabled: 'ON'
vfx-cy: 2023
vfx-cy: 2024
exclude-tests:

# Shared, Release, C++14
Expand All @@ -137,11 +136,11 @@ jobs:
compiler-desc: gcc11.2.1
label:
threads-enabled: 'ON'
vfx-cy: 2023
vfx-cy: 2024
exclude-tests:

# -------------------------------------------------------------------
# VFX CY2023 - Clang 15.0
# VFX CY2024 - Clang 15.0
# -------------------------------------------------------------------
# Release
- build: 6
Expand All @@ -153,11 +152,11 @@ jobs:
compiler-desc: clang15.0
label:
threads-enabled: 'ON'
vfx-cy: 2023
vfx-cy: 2024
exclude-tests:

# -------------------------------------------------------------------
# VFX CY2023 - Clang 14.0
# VFX CY2024 - Clang 14.0
# -------------------------------------------------------------------
# Release
- build: 7
Expand All @@ -169,14 +168,30 @@ jobs:
compiler-desc: clang14.0
label:
threads-enabled: 'ON'
vfx-cy: 2024
exclude-tests:

# -------------------------------------------------------------------
# VFX CY2023 - GCC
# -------------------------------------------------------------------
# Shared, Release
- build: 8
build-type: Release
build-shared: 'ON'
cxx-standard: 17
cxx-compiler: g++
cc-compiler: gcc
compiler-desc: gcc11.2.1
label:
threads-enabled: 'ON'
vfx-cy: 2023
exclude-tests:

# -------------------------------------------------------------------
# VFX CY2022 - GCC, Release
# -------------------------------------------------------------------
# Shared, Release
- build: 8
- build: 9
build-type: Release
build-shared: 'ON'
cxx-standard: 17
Expand All @@ -192,7 +207,7 @@ jobs:
# VFX CY2021 - GCC, Release
# -------------------------------------------------------------------
# Shared, Release
- build: 9
- build: 10
build-type: Release
build-shared: 'ON'
cxx-standard: 17
Expand All @@ -208,7 +223,7 @@ jobs:
# VFX CY2020 - GCC, Release
# -------------------------------------------------------------------
# Shared, Release
- build: 10
- build: 11
build-type: Release
build-shared: 'ON'
cxx-standard: 14
Expand Down Expand Up @@ -294,10 +309,10 @@ jobs:
runs-on: macos-${{ matrix.osver }}
strategy:
matrix:
build: [1, 2, 3, 4, 5]
build: [1, 2, 3, 4, 5, 6]
include:
# -------------------------------------------------------------------
# VFX CY2023 - C++17 - MacOS 11.0
# MacOS 14
# -------------------------------------------------------------------
# Shared, Release
- build: 1
Expand All @@ -306,9 +321,9 @@ jobs:
threads-enabled: 'ON'
compiler-desc: AppleClang11.0
cxx-standard: 17
osver: 11.0
osver: 14
exclude-tests:
vfx-cy: 23
vfx-cy: 24

# Shared, Release, Threads OFF
- build: 2
Expand All @@ -317,9 +332,9 @@ jobs:
threads-enabled: 'OFF'
compiler-desc: AppleClang11.0
cxx-standard: 17
osver: 11.0
osver: 14
exclude-tests:
vfx-cy: 23
vfx-cy: 24

# Static, Release
- build: 3
Expand All @@ -328,9 +343,9 @@ jobs:
threads-enabled: 'ON'
compiler-desc: AppleClang11.0
cxx-standard: 17
osver: 11.0
osver: 14
exclude-tests:
vfx-cy: 23
vfx-cy: 24

# Shared, Debug
- build: 4
Expand All @@ -339,12 +354,12 @@ jobs:
threads-enabled: 'ON'
compiler-desc: AppleClang11.0
cxx-standard: 17
osver: 11.0
osver: 14
exclude-tests:
vfx-cy: 23
vfx-cy: 24

# -------------------------------------------------------------------
# VFX CY2023 - C++17 - MacOS 12
# MacOS 13
# -------------------------------------------------------------------
# Shared, Release
- build: 5
Expand All @@ -353,10 +368,25 @@ jobs:
threads-enabled: 'ON'
compiler-desc: AppleClang11.0
cxx-standard: 17
osver: 12.0
osver: 13
exclude-tests:
vfx-cy: 23

# -------------------------------------------------------------------
# MacOS 12
# -------------------------------------------------------------------
# Shared, Release
- build: 6
build-type: Release
build-shared: 'ON'
threads-enabled: 'ON'
compiler-desc: AppleClang10.5
cxx-standard: 17
osver: 12
exclude-tests:
vfx-cy: 23


steps:
- name: Checkout
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
Expand Down Expand Up @@ -460,7 +490,7 @@ jobs:
exclude-tests: ''
osver: 2022

# -------------------------------------------------------------------
# -------------------------------------------------------------------
# VFX CY2022 - C++17 - Windows 2019 runner - MSVC 2019 (16.11)
# -------------------------------------------------------------------
# Shared, Release
Expand Down

0 comments on commit 10c1d32

Please sign in to comment.