Skip to content

Commit

Permalink
Updated CI workflow to 2024 images.
Browse files Browse the repository at this point in the history 
Signed-off-by: Christina Tempelaar-Lietz <[email protected]>
  • Loading branch information
@xlietz
xlietz committed May 8, 2024
1 parent 2fc9d89 commit 1d07cb5
Showing 1 changed file with 56 additions and 50 deletions.
106 changes: 56 additions & 50 deletions .github/workflows/ci_workflow.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ jobs:
build: [1, 2, 3, 4, 5, 6, 7, 8, 9]
include:
# -------------------------------------------------------------------
# GCC, VFX CY2023
# GCC, VFX CY2024
# -------------------------------------------------------------------
# C++17, Python 3.10.9
# C++17, Python 3.11
- build: 1
build-type: Release
build-shared: 'ON'
Expand All @@ -74,10 +74,10 @@ jobs:
cc-compiler: gcc
compiler-desc: gcc11.2.1
python: 'ON'
python-desc: python3.10.9
vfx-cy: 2023
python-desc: python3.11
vfx-cy: 2024

# C++17, Python 3.10.9, Debug
# C++17, Python 3.11, Debug
- build: 2
build-type: Debug
build-shared: 'ON'
Expand All @@ -86,10 +86,10 @@ jobs:
cc-compiler: gcc
compiler-desc: gcc11.2.1
python: 'ON'
python-desc: python3.10.9
vfx-cy: 2023
python-desc: python3.11
vfx-cy: 2024

# C++17, Python 3.10.9, Static
# C++17, Python 3.11, Static
- build: 3
build-type: Release
build-shared: 'OFF'
Expand All @@ -98,10 +98,10 @@ jobs:
cc-compiler: gcc
compiler-desc: gcc11.2.1
python: 'ON'
python-desc: python3.10.9
vfx-cy: 2023
python-desc: python3.11
vfx-cy: 2024

# C++14, Python 3.10.9
# C++14, Python 3.11
- build: 4
build-type: Release
build-shared: 'ON'
Expand All @@ -110,13 +110,13 @@ jobs:
cc-compiler: gcc
compiler-desc: gcc11.2.1
python: 'ON'
python-desc: python3.10.9
vfx-cy: 2023
python-desc: python3.11
vfx-cy: 2024

# -------------------------------------------------------------------
# Clang 15.0, VFX CY2023
# Clang 15.0, VFX CY2024
# -------------------------------------------------------------------
# C++17, Python 3.10.9
# C++17, Python 3.11
- build: 5
build-type: Release
build-shared: 'ON'
Expand All @@ -125,13 +125,13 @@ jobs:
cc-compiler: clang
compiler-desc: clang15.0
python: 'ON'
python-desc: python3.10.9
vfx-cy: 2023
python-desc: python3.11
vfx-cy: 2024

# -------------------------------------------------------------------
# Clang 14.0, VFX CY2023
# Clang 14.0, VFX CY2024
# -------------------------------------------------------------------
# C++17, Python 3.10.9
# C++17, Python 3.11
- build: 6
build-type: Release
build-shared: 'ON'
Expand All @@ -140,28 +140,28 @@ jobs:
cc-compiler: clang
compiler-desc: clang14.0
python: 'ON'
python-desc: python3.10.9
vfx-cy: 2023
python-desc: python3.11
vfx-cy: 2024

# -------------------------------------------------------------------
# GCC, VFX CY2022
# GCC, VFX CY2023
# -------------------------------------------------------------------
# C++17, Python 3.9
# C++17, Python 3.10.9
- build: 7
build-type: Release
build-shared: 'ON'
cxx-standard: 17
cxx-compiler: g++
cc-compiler: gcc
compiler-desc: gcc9.3.1
compiler-desc: gcc11.2.1
python: 'ON'
python-desc: python3.9.7
vfx-cy: 2022
python-desc: python3.10.9
vfx-cy: 2023

# -------------------------------------------------------------------
# GCC, VFX CY2021
# GCC, VFX CY2022
# -------------------------------------------------------------------
# C++17, Python 3.7.9
# C++17, Python 3.9
- build: 8
build-type: Release
build-shared: 'ON'
Expand All @@ -170,23 +170,23 @@ jobs:
cc-compiler: gcc
compiler-desc: gcc9.3.1
python: 'ON'
python-desc: python3.7.9
vfx-cy: 2021
python-desc: python3.9.7
vfx-cy: 2022

# -------------------------------------------------------------------
# GCC, VFX CY2020
# GCC, VFX CY2021
# -------------------------------------------------------------------
# C++14, Python 3.7
# C++17, Python 3.7.9
- build: 9
build-type: Release
build-shared: 'ON'
cxx-standard: 14
cxx-standard: 17
cxx-compiler: g++
cc-compiler: gcc
compiler-desc: gcc6.3.1
compiler-desc: gcc9.3.1
python: 'ON'
python-desc: python3.7.3
vfx-cy: 2020
python-desc: python3.7.9
vfx-cy: 2021

env:
CXX: ${{ matrix.cxx-compiler }}
Expand Down Expand Up @@ -267,64 +267,70 @@ jobs:
runs-on: macos-${{ matrix.osver }}
strategy:
matrix:
build: [1, 2, 3, 4, 5, 6]
build: [1, 2, 3, 4, 5, 6, 7]
include:
# --------------------------------------------------------------------
# VFX CY2023 - MacOS 11.0
# MacOS 14
# --------------------------------------------------------------------
# C++11
# Release
- build: 1
build-type: Release
build-shared: 'ON'
cxx-standard: 17
exclude-tests:
osver: 11.0
osver: 14

# Debug
- build: 2
build-type: Debug
build-shared: 'ON'
cxx-standard: 17
exclude-tests:
osver: 11.0

osver: 14

# Static
- build: 3
build-type: Debug
build-shared: 'OFF'
cxx-standard: 17
exclude-tests:
osver: 11.0

osver: 14

# C++14
- build: 4
build-type: Release
build-shared: 'ON'
cxx-standard: 14
exclude-tests:
osver: 11.0

osver: 14

# C++11
- build: 5
build-type: Release
build-shared: 'ON'
cxx-standard: 11
exclude-tests:
osver: 11.0
osver: 14

# --------------------------------------------------------------------
# VFX CY2022 - MacOS 12
# MacOS 13
# --------------------------------------------------------------------
# C++11
- build: 6
build-type: Release
build-shared: 'ON'
cxx-standard: 17
exclude-tests:
osver: 12.0
osver: 13

# --------------------------------------------------------------------
# MacOS 12
# --------------------------------------------------------------------
- build: 7
build-type: Release
build-shared: 'ON'
cxx-standard: 17
exclude-tests:
osver: 12

steps:
## - name: Setup Python
Expand Down

0 comments on commit 1d07cb5

Please sign in to comment.