Skip to content

Commit

Permalink
Remove MacOS ARM64 build from CI and align Python version for CY2023 (A…
Browse files Browse the repository at this point in the history
…cademySoftwareFoundation#626)

### Remove MacOS ARM64 build from CI and align Python version for CY2023

### Linked issues
AcademySoftwareFoundation#590 

### Describe the reason for the change.
Removing MacOS ARM64 CY2023 from the CI because XCode 14 is not
available anymore and it is needed to build Qt 5.15.2 from source for
ARM64. **The CI for ARM64 will be back with VFX2024.**

At the same time, I've modified the python version to use 3.10 to align
with VFX2023.

### Describe what you have tested and on which operating system.
CI

Signed-off-by: Cédrik Fuoco <[email protected]>
  • Loading branch information
cedrik-fuoco-adsk authored Nov 15, 2024
1 parent 7e8407a commit 94555c8
Showing 1 changed file with 9 additions and 33 deletions.
42 changes: 9 additions & 33 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
build-type: "Release"
qt-version: "5.15.2"
cmake-version: "3.29.8"
python-version: "3.11.8"
python-version: "3.10"
vfx-platform: "CY2023"
extra_repo: "powertools"
- os: "ubuntu-latest"
Expand All @@ -71,7 +71,7 @@ jobs:
build-type: "Release"
qt-version: "5.15.2"
cmake-version: "3.29.8"
python-version: "3.11.8"
python-version: "3.10"
vfx-platform: "CY2023"
extra_repo: "crb"
- os: "ubuntu-latest"
Expand All @@ -81,7 +81,7 @@ jobs:
build-type: "Debug"
qt-version: "5.15.2"
cmake-version: "3.29.8"
python-version: "3.11.8"
python-version: "3.10"
vfx-platform: "CY2023"
extra_repo: "powertools"
- os: "ubuntu-latest"
Expand All @@ -91,7 +91,7 @@ jobs:
build-type: "Debug"
qt-version: "5.15.2"
cmake-version: "3.29.8"
python-version: "3.11.8"
python-version: "3.10"
vfx-platform: "CY2023"
extra_repo: "crb"
steps:
Expand Down Expand Up @@ -236,25 +236,13 @@ jobs:
arch-type: "x86_64"
build-type: "Release"
qt-version: "5.15.2"
python-version: "3.11"
vfx-platform: "CY2023"
- os: "macos-14"
arch-type: "arm64"
build-type: "Release"
qt-version: "5.15.15"
python-version: "3.11"
python-version: "3.10"
vfx-platform: "CY2023"
- os: "macos-13"
arch-type: "x86_64"
build-type: "Debug"
qt-version: "5.15.2"
python-version: "3.11"
vfx-platform: "CY2023"
- os: "macos-14"
arch-type: "arm64"
build-type: "Debug"
qt-version: "5.15.15"
python-version: "3.11"
python-version: "3.10"
vfx-platform: "CY2023"
steps:
- name: Check if it is a schedule job
Expand Down Expand Up @@ -320,19 +308,7 @@ jobs:
unzip file.zip
cp $(unzip -l file.zip | awk 'NR==4 {print $4}') ${{ github.workspace }}/deps/Qt/${{ matrix.qt-version }}/clang_64/mkspecs/features/toolchain.prf
- name: Build Qt
if: matrix.arch-type == 'arm64'
id: build-qt5-for-arm64
uses: ./.github/actions/build-qt5-for-arm64
with:
qt-version: "5.15.15"
python3-version: "3.11.9"
python2-version: "2.7.18"
xcode-version: "14.3.1"
qt-output: "deps"

- name: Activate Python ${{ matrix.python-version }} if Qt was taken from cache
if: steps.build-qt5-for-arm64.outputs.qt-cache-hit == 'true'
- name: Activate Python ${{ matrix.python-version }}
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # 5.2.0
with:
python-version: '${{ matrix.python-version }}'
Expand Down Expand Up @@ -417,7 +393,7 @@ jobs:
arch-type: "x86_64"
build-type: "Release"
qt-version: "5.15.2"
python-version: "3.11"
python-version: "3.10"
cmake-version: "3.29.8"
vfx-platform: "CY2023"
msvc-component: "14.40.17.10.x86.x64"
Expand All @@ -426,7 +402,7 @@ jobs:
arch-type: "x86_64"
build-type: "Debug"
qt-version: "5.15.2"
python-version: "3.11"
python-version: "3.10"
cmake-version: "3.29.8"
vfx-platform: "CY2023"
msvc-component: "14.40.17.10.x86.x64"
Expand Down

0 comments on commit 94555c8

Please sign in to comment.