Skip to content

Commit 9095d47

Browse files
cozdascozdas
committed
- Bumping C++ standard: 11&14->17, 17->20
- dropping VFX CY2021 Signed-off-by: cuneyt.ozdas <cuneyt.ozdas@autodesk.com>
1 parent 1dfa6aa commit 9095d47

1 file changed

Lines changed: 20 additions & 62 deletions

File tree

‎.github/workflows/ci_workflow.yml‎

Lines changed: 20 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
build-openfx: 'ON'
7474
use-simd: 'ON'
7575
use-oiio: 'ON'
76-
cxx-standard: 17
76+
cxx-standard: 20
7777
cxx-compiler: clang++
7878
cc-compiler: clang
7979
compiler-desc: Clang
@@ -99,7 +99,7 @@ jobs:
9999
build-openfx: 'OFF'
100100
use-simd: 'ON'
101101
use-oiio: 'OFF'
102-
cxx-standard: 11
102+
cxx-standard: 17
103103
cxx-compiler: g++
104104
cc-compiler: gcc
105105
compiler-desc: GCC
@@ -115,7 +115,7 @@ jobs:
115115
build-openfx: 'ON'
116116
use-simd: 'ON'
117117
use-oiio: 'ON'
118-
cxx-standard: 17
118+
cxx-standard: 20
119119
cxx-compiler: clang++
120120
cc-compiler: clang
121121
compiler-desc: Clang
@@ -141,7 +141,7 @@ jobs:
141141
build-openfx: 'OFF'
142142
use-simd: 'ON'
143143
use-oiio: 'OFF'
144-
cxx-standard: 11
144+
cxx-standard: 17
145145
cxx-compiler: g++
146146
cc-compiler: gcc
147147
compiler-desc: GCC
@@ -257,12 +257,12 @@ jobs:
257257
strategy:
258258
fail-fast: true
259259
matrix:
260-
build: [1, 2, 3, 4, 5, 6]
260+
build: [1, 2, 3]
261261
include:
262262
# -------------------------------------------------------------------
263263
# VFX CY2022 (Python 3.9)
264264
# -------------------------------------------------------------------
265-
- build: 6
265+
- build: 1
266266
build-type: Debug
267267
build-shared: 'ON'
268268
build-docs: 'OFF'
@@ -275,7 +275,7 @@ jobs:
275275
compiler-desc: Clang
276276
vfx-cy: 2022
277277
install-ext-packages: ALL
278-
- build: 5
278+
- build: 2
279279
build-type: Release
280280
build-shared: 'ON'
281281
build-docs: 'ON'
@@ -288,60 +288,18 @@ jobs:
288288
compiler-desc: GCC
289289
vfx-cy: 2022
290290
install-ext-packages: MISSING
291-
- build: 4
292-
build-type: Release
293-
build-shared: 'OFF'
294-
build-docs: 'OFF'
295-
build-openfx: 'OFF'
296-
use-simd: 'ON'
297-
use-oiio: 'OFF'
298-
cxx-standard: 11
299-
cxx-compiler: g++
300-
cc-compiler: gcc
301-
compiler-desc: GCC
302-
vfx-cy: 2022
303-
install-ext-packages: ALL
304-
# -------------------------------------------------------------------
305-
# VFX CY2021 (Python 3.7)
306-
# -------------------------------------------------------------------
307291
- build: 3
308-
build-type: Release
309-
build-shared: 'ON'
310-
build-docs: 'OFF'
311-
build-openfx: 'OFF'
312-
use-simd: 'ON'
313-
use-oiio: 'ON'
314-
cxx-standard: 17
315-
cxx-compiler: clang++
316-
cc-compiler: clang
317-
compiler-desc: Clang
318-
vfx-cy: 2021
319-
install-ext-packages: MISSING
320-
- build: 2
321292
build-type: Release
322293
build-shared: 'OFF'
323294
build-docs: 'OFF'
324-
build-openfx: 'ON'
325-
use-simd: 'OFF'
326-
use-oiio: 'OFF'
327-
cxx-standard: 14
328-
cxx-compiler: clang++
329-
cc-compiler: clang
330-
compiler-desc: Clang
331-
vfx-cy: 2021
332-
install-ext-packages: ALL
333-
- build: 1
334-
build-type: Debug
335-
build-shared: 'ON'
336-
build-docs: 'OFF'
337295
build-openfx: 'OFF'
338296
use-simd: 'ON'
339297
use-oiio: 'OFF'
340-
cxx-standard: 11
298+
cxx-standard: 17
341299
cxx-compiler: g++
342300
cc-compiler: gcc
343301
compiler-desc: GCC
344-
vfx-cy: 2021
302+
vfx-cy: 2022
345303
install-ext-packages: ALL
346304
env:
347305
CXX: ${{ matrix.cxx-compiler }}
@@ -472,7 +430,7 @@ jobs:
472430
build-openfx: 'ON'
473431
use-simd: 'ON'
474432
use-oiio: 'ON'
475-
cxx-standard: 17
433+
cxx-standard: 20
476434
python-version: '3.11'
477435
# Keeping one universal build
478436
- build: 4
@@ -483,7 +441,7 @@ jobs:
483441
build-openfx: 'OFF'
484442
use-simd: 'ON'
485443
use-oiio: 'OFF'
486-
cxx-standard: 11
444+
cxx-standard: 17
487445
python-version: '3.10'
488446
- build: 3
489447
arch-type: "x86_64"
@@ -493,7 +451,7 @@ jobs:
493451
build-openfx: 'OFF'
494452
use-simd: 'OFF'
495453
use-oiio: 'OFF'
496-
cxx-standard: 11
454+
cxx-standard: 17
497455
python-version: '3.10'
498456
- build: 2
499457
arch-type: "x86_64"
@@ -503,7 +461,7 @@ jobs:
503461
build-openfx: 'ON'
504462
use-simd: 'ON'
505463
use-oiio: 'OFF'
506-
cxx-standard: 11
464+
cxx-standard: 17
507465
python-version: '3.9'
508466
- build: 1
509467
arch-type: "x86_64"
@@ -513,7 +471,7 @@ jobs:
513471
build-openfx: 'ON'
514472
use-simd: 'ON'
515473
use-oiio: 'OFF'
516-
cxx-standard: 14
474+
cxx-standard: 17
517475
python-version: '3.7'
518476
steps:
519477
- name: Setup Python
@@ -628,7 +586,7 @@ jobs:
628586
build-openfx: 'OFF'
629587
use-simd: 'ON'
630588
use-oiio: 'OFF'
631-
cxx-standard: 11
589+
cxx-standard: 17
632590
python-version: '3.11'
633591
- build: 2
634592
arch-type: "x86_64;arm64"
@@ -639,7 +597,7 @@ jobs:
639597
build-openfx: 'OFF'
640598
use-simd: 'ON'
641599
use-oiio: 'OFF'
642-
cxx-standard: 11
600+
cxx-standard: 17
643601
python-version: '3.11'
644602
steps:
645603
- name: Setup Python
@@ -761,7 +719,7 @@ jobs:
761719
build-openfx: 'ON'
762720
use-simd: 'OFF'
763721
use-oiio: 'ON'
764-
cxx-standard: 17
722+
cxx-standard: 20
765723
python-version: '3.11'
766724
- build: 3
767725
build-type: Release
@@ -770,7 +728,7 @@ jobs:
770728
build-openfx: 'OFF'
771729
use-simd: 'ON'
772730
use-oiio: 'OFF'
773-
cxx-standard: 11
731+
cxx-standard: 17
774732
python-version: '3.9'
775733
- build: 2
776734
build-type: Debug
@@ -779,7 +737,7 @@ jobs:
779737
build-openfx: 'OFF'
780738
use-simd: 'ON'
781739
use-oiio: 'OFF'
782-
cxx-standard: 11
740+
cxx-standard: 17
783741
python-version: '3.8'
784742
# C++14, OpenEXR, OpenFX
785743
- build: 1
@@ -789,7 +747,7 @@ jobs:
789747
build-openfx: 'ON'
790748
use-simd: 'ON'
791749
use-oiio: 'OFF'
792-
cxx-standard: 14
750+
cxx-standard: 17
793751
python-version: '3.7'
794752
steps:
795753
- name: Setup Python

0 commit comments

Comments
 (0)