Skip to content

Commit b37089a

Browse files
remiaremia
authored
Port from main to RB-2.1 - Python 3.10 macOS wheels (#1544)
* Enable mac OS Python 3.10 wheels Disable Wheel build on OCIO forks Signed-off-by: Rémi Achard <[email protected]> * Update CI workflow to match main branch Signed-off-by: Rémi Achard <[email protected]>
1 parent 177a927 commit b37089a

File tree

2 files changed

+49
-30
lines changed

2 files changed

+49
-30
lines changed

‎.github/workflows/ci_workflow.yml‎

Lines changed: 31 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@ jobs:
5959
image: aswf/ci-ocio:${{ matrix.vfx-cy }}
6060
strategy:
6161
matrix:
62-
build: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
62+
build: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]
6363
include:
6464
# -------------------------------------------------------------------
6565
# VFX CY2022 (Python 3.9)
6666
# -------------------------------------------------------------------
6767
# Clang, Debug, OpenFX
68-
- build: 12
68+
- build: 13
6969
build-type: Debug
7070
build-shared: 'ON'
7171
build-docs: 'OFF'
@@ -78,7 +78,7 @@ jobs:
7878
compiler-desc: Clang 9
7979
vfx-cy: 2022
8080
# GCC, no SSE, OpenFX
81-
- build: 11
81+
- build: 12
8282
build-type: Release
8383
build-shared: 'ON'
8484
build-docs: 'OFF'
@@ -90,15 +90,28 @@ jobs:
9090
cc-compiler: gcc
9191
compiler-desc: GCC 9.3.1
9292
vfx-cy: 2022
93-
# GCC, static, docs
94-
- build: 10
93+
# C++14, GCC, static, docs
94+
- build: 11
9595
build-type: Release
9696
build-shared: 'OFF'
9797
build-docs: 'ON'
9898
build-openfx: 'OFF'
9999
use-sse: 'ON'
100100
use-openexr-half: 'OFF'
101-
cxx-standard: 17
101+
cxx-standard: 14
102+
cxx-compiler: g++
103+
cc-compiler: gcc
104+
compiler-desc: GCC 9.3.1
105+
vfx-cy: 2022
106+
# C++11, GCC, static
107+
- build: 10
108+
build-type: Release
109+
build-shared: 'OFF'
110+
build-docs: 'OFF'
111+
build-openfx: 'OFF'
112+
use-sse: 'ON'
113+
use-openexr-half: 'OFF'
114+
cxx-standard: 11
102115
cxx-compiler: g++
103116
cc-compiler: gcc
104117
compiler-desc: GCC 9.3.1
@@ -119,36 +132,36 @@ jobs:
119132
cc-compiler: clang
120133
compiler-desc: Clang 9
121134
vfx-cy: 2021
122-
# Clang, static, no SSE, OpenFX
135+
# C++14, Clang, static, no SSE, OpenFX
123136
- build: 8
124137
build-type: Release
125138
build-shared: 'OFF'
126139
build-docs: 'OFF'
127140
build-openfx: 'ON'
128141
use-sse: 'OFF'
129142
use-openexr-half: 'ON'
130-
cxx-standard: 17
143+
cxx-standard: 14
131144
cxx-compiler: clang++
132145
cc-compiler: clang
133146
compiler-desc: Clang 9
134147
vfx-cy: 2021
135-
# GCC, Debug
148+
# C++11, GCC, Debug
136149
- build: 7
137150
build-type: Debug
138151
build-shared: 'ON'
139152
build-docs: 'OFF'
140153
build-openfx: 'OFF'
141154
use-sse: 'ON'
142155
use-openexr-half: 'ON'
143-
cxx-standard: 17
156+
cxx-standard: 11
144157
cxx-compiler: g++
145158
cc-compiler: gcc
146159
compiler-desc: GCC 9.3.1
147160
vfx-cy: 2021
148161
# -------------------------------------------------------------------
149162
# VFX CY2020 (Python 3.7)
150163
# -------------------------------------------------------------------
151-
# Clang, OpenFX
164+
# C++14, Clang, OpenFX
152165
- build: 6
153166
build-type: Release
154167
build-shared: 'ON'
@@ -161,7 +174,7 @@ jobs:
161174
cc-compiler: clang
162175
compiler-desc: Clang 7
163176
vfx-cy: 2020
164-
# GCC, static, Debug, OpenFX
177+
# C++14, GCC, static, Debug, OpenFX
165178
- build: 5
166179
build-type: Debug
167180
build-shared: 'OFF'
@@ -174,23 +187,23 @@ jobs:
174187
cc-compiler: gcc
175188
compiler-desc: GCC 6.3.1
176189
vfx-cy: 2020
177-
# GCC, no SSE, docs
190+
# C++11, GCC, no SSE, docs
178191
- build: 4
179192
build-type: Release
180193
build-shared: 'ON'
181194
build-docs: 'ON'
182195
build-openfx: 'OFF'
183196
use-sse: 'ON'
184197
use-openexr-half: 'ON'
185-
cxx-standard: 14
198+
cxx-standard: 11
186199
cxx-compiler: g++
187200
cc-compiler: gcc
188201
compiler-desc: GCC 6.3.1
189202
vfx-cy: 2020
190203
# -------------------------------------------------------------------
191204
# VFX CY2019 (Python 2.7)
192205
# -------------------------------------------------------------------
193-
# Clang, static
206+
# C++11, Clang, static
194207
- build: 3
195208
build-type: Release
196209
build-shared: 'OFF'
@@ -204,7 +217,7 @@ jobs:
204217
cc-compiler: clang
205218
compiler-desc: Clang 7
206219
vfx-cy: 2019
207-
# Clang, Debug, no SSE
220+
# C++11, Clang, Debug, no SSE
208221
- build: 2
209222
build-type: Debug
210223
build-shared: 'ON'
@@ -218,7 +231,7 @@ jobs:
218231
cc-compiler: clang
219232
compiler-desc: Clang 7
220233
vfx-cy: 2019
221-
# GCC, OpenFX
234+
# C++11, GCC, OpenFX
222235
- build: 1
223236
build-type: Release
224237
build-shared: 'ON'
@@ -518,6 +531,7 @@ jobs:
518531
if: matrix.build-docs == 'ON'
519532
- name: Install tests env
520533
run: share/ci/scripts/windows/install_tests_env.sh
534+
shell: bash
521535
- name: Create build directories
522536
run: |
523537
mkdir _install

‎.github/workflows/wheel_workflow.yml‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ jobs:
4141
linux:
4242
name: Build wheels on Linux
4343
runs-on: ubuntu-latest
44+
# Don't run on OCIO forks
45+
if: |
46+
github.event_name != 'schedule' ||
47+
github.repository == 'AcademySoftwareFoundation/OpenColorIO'
4448
strategy:
4549
matrix:
4650
include:
@@ -129,16 +133,13 @@ jobs:
129133
macos:
130134
name: Build wheels on macOS
131135
runs-on: macos-10.15
136+
# Don't run on OCIO forks
137+
if: |
138+
github.event_name != 'schedule' ||
139+
github.repository == 'AcademySoftwareFoundation/OpenColorIO'
132140
strategy:
133141
matrix:
134142
include:
135-
# Python 3.10 can be enabled when numpy ship the binary wheel (which
136-
# we use during tests). Building it within GH produces the following:
137-
# RuntimeError: Polyfit sanity test emitted a warning, most likely due
138-
# to using a buggy Accelerate backend. If you compiled yourself, see
139-
# site.cfg.example for information. Otherwise report this to the vendor
140-
# that provided NumPy.
141-
142143
# -------------------------------------------------------------------
143144
# CPython 64 bits
144145
# -------------------------------------------------------------------
@@ -154,9 +155,9 @@ jobs:
154155
- build: CPython 3.9 64 bits
155156
python: cp39-*
156157
arch: x86_64
157-
# - build: CPython 3.10 64 bits
158-
# python: cp310-*
159-
# arch: x86_64
158+
- build: CPython 3.10 64 bits
159+
python: cp310-*
160+
arch: x86_64
160161
# -------------------------------------------------------------------
161162
# CPython ARM 64 bits
162163
# -------------------------------------------------------------------
@@ -166,9 +167,9 @@ jobs:
166167
- build: CPython 3.9 ARM 64 bits
167168
python: cp39-*
168169
arch: arm64
169-
# - build: CPython 3.10 ARM 64 bits
170-
# python: cp310-*
171-
# arch: arm64
170+
- build: CPython 3.10 ARM 64 bits
171+
python: cp310-*
172+
arch: arm64
172173

173174
steps:
174175
- uses: actions/checkout@v2
@@ -195,6 +196,10 @@ jobs:
195196
windows:
196197
name: Build wheels on Windows
197198
runs-on: windows-2019
199+
# Don't run on OCIO forks
200+
if: |
201+
github.event_name != 'schedule' ||
202+
github.repository == 'AcademySoftwareFoundation/OpenColorIO'
198203
strategy:
199204
matrix:
200205
include:

0 commit comments

Comments
 (0)