Skip to content

Commit 715af71

Browse files
doug-walkerdoug-walker
committed
Implement TSC requests
Signed-off-by: Doug Walker <doug.walker@autodesk.com>
1 parent 40fb2d1 commit 715af71

6 files changed

Lines changed: 48 additions & 98 deletions

File tree

‎.github/workflows/ci_workflow.yml‎

Lines changed: 7 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ jobs:
317317
# ---------------------------------------------------------------------------
318318

319319
macos:
320-
name: 'macOS 13
320+
name: 'macOS 15 intel
321321
<AppleClang
322322
arch=${{ matrix.arch-type }},
323323
config=${{ matrix.build-type }},
@@ -334,19 +334,8 @@ jobs:
334334
runs-on: macos-15-intel
335335
strategy:
336336
matrix:
337-
build: [1, 2, 3, 4, 5]
337+
build: [3, 4]
338338
include:
339-
- build: 5
340-
arch-type: "x86_64"
341-
build-type: Release
342-
build-shared: 'ON'
343-
build-docs: 'OFF'
344-
build-openfx: 'ON'
345-
use-simd: 'ON'
346-
use-oiio: 'ON'
347-
cxx-standard: 20
348-
python-version: '3.13'
349-
# Keeping one universal build
350339
- build: 4
351340
arch-type: "x86_64;arm64"
352341
build-type: Release
@@ -358,35 +347,15 @@ jobs:
358347
cxx-standard: 20
359348
python-version: '3.12'
360349
- build: 3
361-
arch-type: "x86_64"
362-
build-type: Release
363-
build-shared: 'ON'
364-
build-docs: 'ON'
365-
build-openfx: 'OFF'
366-
use-simd: 'OFF'
367-
use-oiio: 'OFF'
368-
cxx-standard: 17
369-
python-version: '3.11'
370-
- build: 2
371350
arch-type: "x86_64"
372351
build-type: Debug
373-
build-shared: 'ON'
374-
build-docs: 'OFF'
375-
build-openfx: 'ON'
376-
use-simd: 'ON'
377-
use-oiio: 'OFF'
378-
cxx-standard: 17
379-
python-version: '3.10'
380-
- build: 1
381-
arch-type: "x86_64"
382-
build-type: Release
383352
build-shared: 'OFF'
384353
build-docs: 'OFF'
385354
build-openfx: 'ON'
386-
use-simd: 'ON'
355+
use-simd: 'OFF'
387356
use-oiio: 'OFF'
388357
cxx-standard: 17
389-
python-version: '3.9'
358+
python-version: '3.10'
390359
steps:
391360
- name: Setup Python
392361
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
@@ -496,10 +465,10 @@ jobs:
496465
test-rosetta: "OFF"
497466
build-type: Release
498467
build-shared: 'ON'
499-
build-docs: 'OFF'
468+
build-docs: 'ON'
500469
build-openfx: 'OFF'
501470
use-simd: 'ON'
502-
use-oiio: 'OFF'
471+
use-oiio: 'ON'
503472
cxx-standard: 20
504473
python-version: '3.13'
505474
- build: 2
@@ -660,7 +629,7 @@ jobs:
660629
use-simd: 'ON'
661630
use-oiio: 'OFF'
662631
cxx-standard: 17
663-
python-version: '3.9'
632+
python-version: '3.10'
664633
steps:
665634
- name: Setup Python
666635
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0

‎.github/workflows/dependencies_latest.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
CC: ${{ matrix.cc-compiler }}
8888
steps:
8989
- name: Checkout
90-
uses: actions/checkout@v3
90+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
9191
- name: Install docs env
9292
run: share/ci/scripts/linux/dnf/install_docs_env.sh
9393
if: matrix.build-docs == 'ON'
@@ -180,11 +180,11 @@ jobs:
180180
python-version: '3.9'
181181
steps:
182182
- name: Setup Python
183-
uses: actions/setup-python@v5
183+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
184184
with:
185185
python-version: ${{ matrix.python-version }}
186186
- name: Checkout
187-
uses: actions/checkout@v4
187+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
188188
- name: Install docs env
189189
run: share/ci/scripts/macos/install_docs_env.sh
190190
if: matrix.build-docs == 'ON'
@@ -279,11 +279,11 @@ jobs:
279279
use-oiio: 'OFF'
280280
steps:
281281
- name: Setup Python
282-
uses: actions/setup-python@v5
282+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
283283
with:
284284
python-version: ${{ matrix.python-version }}
285285
- name: Checkout
286-
uses: actions/checkout@v4
286+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
287287
- name: Install docs env
288288
run: |
289289
DOXYGEN_PATH=$GITHUB_WORKSPACE/doxygen

‎.github/workflows/deploy_site.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
- name: Install Dart Sass
5050
run: sudo snap install dart-sass
5151
- name: Checkout
52-
uses: actions/checkout@v4
52+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5353
with:
5454
submodules: recursive
5555
- name: Setup Pages

‎.github/workflows/platform_latest.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
CC: ${{ matrix.cc-compiler }}
8787
steps:
8888
- name: Checkout
89-
uses: actions/checkout@v4
89+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
9090
- name: Install tests env
9191
run: share/ci/scripts/linux/dnf/install_tests_env.sh
9292
- name: Create build directories
@@ -197,11 +197,11 @@ jobs:
197197
python-version: '3.9'
198198
steps:
199199
- name: Setup Python
200-
uses: actions/setup-python@v5
200+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
201201
with:
202202
python-version: ${{ matrix.python-version }}
203203
- name: Checkout
204-
uses: actions/checkout@v4
204+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
205205
- name: Install tests env
206206
run: share/ci/scripts/macos/install_tests_env.sh
207207
- name: Create build directories
@@ -308,11 +308,11 @@ jobs:
308308
python-version: '3.9'
309309
steps:
310310
- name: Setup Python
311-
uses: actions/setup-python@v5
311+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
312312
with:
313313
python-version: ${{ matrix.python-version }}
314314
- name: Checkout
315-
uses: actions/checkout@v4
315+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
316316
- name: Install tests env
317317
run: share/ci/scripts/windows/install_tests_env.sh
318318
shell: bash

‎.github/workflows/release-sign.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
shell: bash
5050

5151
- name: Checkout
52-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
52+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5353

5454
- name: Create archive
5555
run: git archive --format=tar.gz -o ${OCIO_TARBALL} --prefix ${OCIO_PREFIX} ${TAG}

‎.github/workflows/wheel_workflow.yml‎

Lines changed: 29 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,18 @@ jobs:
5050
github.repository == 'AcademySoftwareFoundation/OpenColorIO'
5151
5252
steps:
53+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5354

54-
- uses: actions/checkout@v4
55+
- name: Build SDist
56+
run: pipx run build --sdist
5557

56-
- name: Build SDist
57-
run: pipx run build --sdist
58+
- name: Check metadata
59+
run: pipx run twine check dist/*
5860

59-
- name: Check metadata
60-
run: pipx run twine check dist/*
61-
62-
- uses: actions/upload-artifact@v4
63-
with:
64-
name: cibw-sdist
65-
path: dist/*.tar.gz
61+
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
62+
with:
63+
name: cibw-sdist
64+
path: dist/*.tar.gz
6665

6766
# ---------------------------------------------------------------------------
6867
# Linux Wheels
@@ -81,10 +80,6 @@ jobs:
8180
# -------------------------------------------------------------------
8281
# CPython 64 bits manylinux_2_28
8382
# -------------------------------------------------------------------
84-
- build: CPython 3.9 64 bits manylinux_2_28
85-
manylinux: manylinux_2_28
86-
python: cp39-manylinux_x86_64
87-
arch: x86_64
8883
- build: CPython 3.10 64 bits manylinux_2_28
8984
manylinux: manylinux_2_28
9085
python: cp310-manylinux_x86_64
@@ -108,10 +103,6 @@ jobs:
108103
# -------------------------------------------------------------------
109104
# CPython 64 bits manylinux2014
110105
# -------------------------------------------------------------------
111-
- build: CPython 3.9 64 bits manylinux2014
112-
manylinux: manylinux2014
113-
python: cp39-manylinux_x86_64
114-
arch: x86_64
115106
- build: CPython 3.10 64 bits manylinux2014
116107
manylinux: manylinux2014
117108
python: cp310-manylinux_x86_64
@@ -134,9 +125,9 @@ jobs:
134125
arch: x86_64
135126

136127
steps:
137-
- uses: actions/checkout@v4
128+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
138129

139-
- uses: actions/setup-python@v5
130+
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
140131
name: Install Python
141132
with:
142133
python-version: '3.11'
@@ -148,7 +139,7 @@ jobs:
148139
CIBW_ARCHS: ${{ matrix.arch }}
149140
CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux }}
150141

151-
- uses: actions/upload-artifact@v4
142+
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
152143
with:
153144
name: cibw-wheels-${{ matrix.python }}-${{ matrix.manylinux }}
154145
path: ./wheelhouse/*.whl
@@ -170,10 +161,6 @@ jobs:
170161
# -------------------------------------------------------------------
171162
# CPython ARM 64 bits manylinux2014
172163
# -------------------------------------------------------------------
173-
- build: CPython 3.9 ARM 64 bits manylinux2014
174-
manylinux: manylinux2014
175-
python: cp39-manylinux_aarch64
176-
arch: aarch64
177164
- build: CPython 3.10 ARM 64 bits manylinux2014
178165
manylinux: manylinux2014
179166
python: cp310-manylinux_aarch64
@@ -196,9 +183,9 @@ jobs:
196183
arch: aarch64
197184

198185
steps:
199-
- uses: actions/checkout@v4
186+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
200187

201-
- uses: actions/setup-python@v5
188+
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
202189
name: Install Python
203190
with:
204191
python-version: '3.11'
@@ -210,7 +197,7 @@ jobs:
210197
CIBW_ARCHS: ${{ matrix.arch }}
211198
CIBW_MANYLINUX_AARCH64_IMAGE: ${{ matrix.manylinux }}
212199

213-
- uses: actions/upload-artifact@v4
200+
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
214201
with:
215202
name: cibw-wheels-${{ matrix.python }}-${{ matrix.manylinux }}
216203
path: ./wheelhouse/*.whl
@@ -232,9 +219,6 @@ jobs:
232219
# -------------------------------------------------------------------
233220
# CPython 64 bits
234221
# -------------------------------------------------------------------
235-
- build: CPython 3.9 64 bits
236-
python: cp39-macosx_x86_64
237-
arch: x86_64
238222
- build: CPython 3.10 64 bits
239223
python: cp310-macosx_x86_64
240224
arch: x86_64
@@ -252,9 +236,9 @@ jobs:
252236
arch: x86_64
253237

254238
steps:
255-
- uses: actions/checkout@v4
239+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
256240

257-
- uses: actions/setup-python@v5
241+
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
258242
name: Install Python
259243
with:
260244
python-version: '3.11'
@@ -269,7 +253,7 @@ jobs:
269253
CIBW_BUILD: ${{ matrix.python }}
270254
CIBW_ARCHS: ${{ matrix.arch }}
271255

272-
- uses: actions/upload-artifact@v4
256+
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
273257
with:
274258
name: cibw-wheels-${{ matrix.python }}
275259
path: ./wheelhouse/*.whl
@@ -291,9 +275,6 @@ jobs:
291275
# -------------------------------------------------------------------
292276
# CPython ARM 64 bits
293277
# -------------------------------------------------------------------
294-
- build: CPython 3.9 ARM 64 bits
295-
python: cp39-macosx_arm64
296-
arch: arm64
297278
- build: CPython 3.10 ARM 64 bits
298279
python: cp310-macosx_arm64
299280
arch: arm64
@@ -311,9 +292,9 @@ jobs:
311292
arch: arm64
312293

313294
steps:
314-
- uses: actions/checkout@v4
295+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
315296

316-
- uses: actions/setup-python@v5
297+
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
317298
name: Install Python
318299
with:
319300
python-version: '3.11'
@@ -324,7 +305,7 @@ jobs:
324305
CIBW_BUILD: ${{ matrix.python }}
325306
CIBW_ARCHS: ${{ matrix.arch }}
326307

327-
- uses: actions/upload-artifact@v4
308+
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
328309
with:
329310
name: cibw-wheels-${{ matrix.python }}
330311
path: ./wheelhouse/*.whl
@@ -346,9 +327,6 @@ jobs:
346327
# -------------------------------------------------------------------
347328
# CPython 64 bits
348329
# -------------------------------------------------------------------
349-
- build: CPython 3.9 64 bits
350-
python: cp39-win_amd64
351-
arch: AMD64
352330
- build: CPython 3.10 64 bits
353331
python: cp310-win_amd64
354332
arch: AMD64
@@ -366,9 +344,9 @@ jobs:
366344
arch: AMD64
367345

368346
steps:
369-
- uses: actions/checkout@v4
347+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
370348

371-
- uses: actions/setup-python@v5
349+
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
372350
name: Install Python
373351
with:
374352
python-version: '3.11'
@@ -379,20 +357,23 @@ jobs:
379357
CIBW_BUILD: ${{ matrix.python }}
380358
CIBW_ARCHS: ${{ matrix.arch }}
381359

382-
- uses: actions/upload-artifact@v4
360+
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
383361
with:
384362
name: cibw-wheels-${{ matrix.python }}
385363
path: ./wheelhouse/*.whl
386364

365+
# ---------------------------------------------------------------------------
366+
# Upload
367+
# ---------------------------------------------------------------------------
387368

388369
upload_pypi:
389370
needs: [sdist, linux, linux-arm, macos, macos-arm, windows]
390371
runs-on: ubuntu-latest
391372
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v')
392373
steps:
393-
- uses: actions/setup-python@v5
374+
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
394375

395-
- uses: actions/download-artifact@v4
376+
- uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
396377
with:
397378
pattern: cibw-*
398379
path: dist

0 commit comments

Comments
 (0)