Skip to content

Commit

Permalink
Update macOS runners to 10.11, bump actions version (AcademySoftwareF…
Browse files Browse the repository at this point in the history 
…oundation#1714)

Signed-off-by: Rémi Achard <remiachard@gmail.com>
Co-authored-by: Michael Dolan <michdolan@gmail.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
  • Loading branch information
@remia @michdolan
@doug-walker @cedrik-fuoco-adsk
3 people authored and cedrik-fuoco-adsk committed Mar 24, 2023
1 parent 794acce commit 41afaec
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 28 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/analysis_workflow.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
CC: ${{ matrix.cc-compiler }}
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Install docs env
run: share/ci/scripts/linux/yum/install_docs_env.sh
if: matrix.build-docs == 'ON'
Expand Down Expand Up @@ -189,11 +189,11 @@ jobs:
python-version: 3.9
steps:
- name: Setup Python
uses: actions/setup-python@v1
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Install docs env
run: share/ci/scripts/macos/install_docs_env.sh
if: matrix.build-docs == 'ON'
Expand Down Expand Up @@ -295,11 +295,11 @@ jobs:
python-version: 3.9
steps:
- name: Setup Python
uses: actions/setup-python@v1
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Install docs env
run: share/ci/scripts/windows/install_docs_env.sh
shell: bash
Expand Down Expand Up @@ -418,7 +418,7 @@ jobs:
CC: gcc
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 50
- name: Install docs env
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/ci_workflow.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ jobs:
CC: ${{ matrix.cc-compiler }}
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
# minizip-ng requires CMake 3.13+ but VFX2019 image ships with 3.12
- name: Upgrade VFX2019 CMake
run: pip install cmake==3.13.3
Expand Down Expand Up @@ -336,7 +336,7 @@ jobs:
# ---------------------------------------------------------------------------

macos:
name: 'macOS 10.15
name: 'macOS 11
<AppleClang 11.0
config=${{ matrix.build-type }},
shared=${{ matrix.build-shared }},
Expand All @@ -349,7 +349,7 @@ jobs:
if: |
github.event_name == 'push' ||
github.event.pull_request.head.repo.full_name != github.repository
runs-on: macos-10.15
runs-on: macos-11
strategy:
matrix:
build: [1, 2, 3, 4, 5, 6]
Expand Down Expand Up @@ -417,11 +417,11 @@ jobs:
python-version: 2.7
steps:
- name: Setup Python
uses: actions/setup-python@v1
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Install docs env
run: share/ci/scripts/macos/install_docs_env.sh
if: matrix.build-docs == 'ON'
Expand Down Expand Up @@ -585,11 +585,11 @@ jobs:
python-version: 2.7
steps:
- name: Setup Python
uses: actions/setup-python@v1
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Install docs env
run: share/ci/scripts/windows/install_docs_env.sh
shell: bash
Expand Down
30 changes: 15 additions & 15 deletions .github/workflows/wheel_workflow.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@ jobs:
steps:

- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Build SDist
run: pipx run build --sdist

- name: Check metadata
run: pipx run twine check dist/*

- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
path: dist/*.tar.gz

Expand Down Expand Up @@ -115,15 +115,15 @@ jobs:
arch: aarch64

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- uses: actions/setup-python@v2
- uses: actions/setup-python@v4
name: Install Python
with:
python-version: '3.8'

- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v2
with:
platforms: all

Expand All @@ -133,7 +133,7 @@ jobs:
CIBW_BUILD: ${{ matrix.python }}
CIBW_ARCHS: ${{ matrix.arch }}

- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
path: ./wheelhouse/*.whl

Expand All @@ -143,7 +143,7 @@ jobs:

macos:
name: Build wheels on macOS
runs-on: macos-10.15
runs-on: macos-11
# Don't run on OCIO forks
if: |
github.event_name != 'schedule' ||
Expand Down Expand Up @@ -186,9 +186,9 @@ jobs:
arch: arm64

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- uses: actions/setup-python@v2
- uses: actions/setup-python@v4
name: Install Python
with:
python-version: '3.8'
Expand All @@ -199,7 +199,7 @@ jobs:
CIBW_BUILD: ${{ matrix.python }}
CIBW_ARCHS: ${{ matrix.arch }}

- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
path: ./wheelhouse/*.whl

Expand Down Expand Up @@ -237,9 +237,9 @@ jobs:
arch: AMD64

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- uses: actions/setup-python@v2
- uses: actions/setup-python@v4
name: Install Python
with:
python-version: '3.8'
Expand All @@ -250,7 +250,7 @@ jobs:
CIBW_BUILD: ${{ matrix.python }}
CIBW_ARCHS: ${{ matrix.arch }}

- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
path: ./wheelhouse/*.whl

Expand All @@ -260,9 +260,9 @@ jobs:
runs-on: ubuntu-latest
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v')
steps:
- uses: actions/setup-python@v2
- uses: actions/setup-python@v4

- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: artifact
path: dist
Expand Down

0 comments on commit 41afaec

Please sign in to comment.