OpenUSD: Change to macOS-13 and Xcode 14 (Due to deprecation of macOS-12

builder) (Internal change: 2344660)
PixarAnimationStudios · Oct 15, 2024 · 0b6dd83 · 0b6dd83
1 parent 633e468
commit 0b6dd83
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/buildusd.yml b/.github/workflows/buildusd.yml
@@ -70,7 +70,7 @@ jobs:
   macOS:
     needs: [GetUser]
     if: ${{ (github.event.issue.pull_request && contains(github.event.comment.body, '/AzurePipelines run') && needs.GetUser.outputs.require-result == 'true' ) || github.event_name == 'push' }}
-    runs-on: macos-12
+    runs-on: macos-13
     timeout-minutes: 120
     steps:
       - run: echo ${{ needs.GetUser.outputs.require-result }}
@@ -91,7 +91,7 @@ jobs:
       - name: Install dependencies
         run: |
           export PATH=/Applications/CMake.app/Contents/bin:$PATH
-          sudo xcode-select -s /Applications/Xcode_13.3.app/Contents/Developer
+          sudo xcode-select -s /Applications/Xcode_14.1.app/Contents/Developer
           # Set SYSTEM_VERSION_COMPAT while installing Python packages to
           # accommodate the macOS version numbering change from 10.x to 11
           export SYSTEM_VERSION_COMPAT=1

diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml
@@ -109,7 +109,7 @@ jobs:
           - VERSION_SPEC: '3.11'
             INTERPRETER: python3.11
             TAG: cp311
-    runs-on: macos-12
+    runs-on: macos-13
     timeout-minutes: 120
     steps:
       - name: Checkout code
@@ -125,7 +125,7 @@ jobs:
           ${{ matrix.PYTHON.INTERPRETER }} -m pip install delocate~=0.10.2 wheel
       - name: Build USD
         run: |
-          sudo xcode-select -s /Applications/Xcode_13.3.app/Contents/Developer
+          sudo xcode-select -s /Applications/Xcode_14.1.app/Contents/Developer
           ${{ matrix.PYTHON.INTERPRETER }} build_scripts/build_usd.py --build-args USD,"-DPXR_PY_UNDEFINED_DYNAMIC_LOOKUP=ON -DPXR_BUILD_USD_TOOLS=OFF -DPXR_INSTALL_LOCATION=../pluginfo" --no-materialx --no-imaging --no-examples --no-tutorials --generator Xcode --build-target universal --build $GITHUB_WORKSPACE/USDgen/build --src $GITHUB_WORKSPACE/USDgen/src $GITHUB_WORKSPACE/USDinst -v
       - name: Packaging USD
         run: |
@@ -263,19 +263,19 @@ jobs:
             PYTHON_INTERPRETER: python3
           - NAME: Mac_Python38
             PYTHON_VERSION_SPEC: '3.8'
-            IMAGE: macos-12
+            IMAGE: macos-13
             PYTHON_INTERPRETER: python3  
           - NAME: Mac_Python39
             PYTHON_VERSION_SPEC: '3.9'
-            IMAGE: macos-12
+            IMAGE: macos-13
             PYTHON_INTERPRETER: python3
           - NAME: Mac_Python310
             PYTHON_VERSION_SPEC: '3.10'
-            IMAGE: macos-12
+            IMAGE: macos-13
             PYTHON_INTERPRETER: python3  
           - NAME: Mac_Python311
             PYTHON_VERSION_SPEC: '3.11'
-            IMAGE: macos-12
+            IMAGE: macos-13
             PYTHON_INTERPRETER: python3          
           - NAME: Windows_Python38
             PYTHON_VERSION_SPEC: '3.8'

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -25,12 +25,12 @@ jobs:
 - job: macOS
   timeoutInMinutes: 120
   pool:
-    vmImage: 'macOS-12'
+    vmImage: 'macOS-13'
   steps:
   - script: |
       # Update PATH to ensure that pyside2-uic can be found
       export PATH=/Library/Frameworks/Python.framework/Versions/3.11/bin:$PATH
-      sudo xcode-select -s /Applications/Xcode_13.3.app/Contents/Developer
+      sudo xcode-select -s /Applications/Xcode_14.1.app/Contents/Developer
       # Set SYSTEM_VERSION_COMPAT while installing Python packages to
       # accommodate the macOS version numbering change from 10.x to 11
       export SYSTEM_VERSION_COMPAT=1

diff --git a/azure-pypi-pipeline.yml b/azure-pypi-pipeline.yml
@@ -189,14 +189,14 @@ stages:
           PYTHON_TAG: cp312
     timeoutInMinutes: 180
     pool:
-      vmImage: 'macOS-12'
+      vmImage: 'macOS-13'
     steps:
     - task: UsePythonVersion@0
       inputs:
         versionSpec: $(PYTHON_VERSION_SPEC)
         addToPath: true
     - script: |
-        sudo xcode-select -s /Applications/Xcode_13.2.app/Contents/Developer
+        sudo xcode-select -s /Applications/Xcode_14.1.app/Contents/Developer
         $(PYTHON_INTERPRETER) build_scripts/build_usd.py --build-args USD,"-DPXR_PY_UNDEFINED_DYNAMIC_LOOKUP=ON -DPXR_BUILD_USD_TOOLS=OFF -DPXR_INSTALL_LOCATION=../pluginfo" --no-materialx --no-imaging --no-examples --no-tutorials --generator Xcode --build-target universal --build $HOME/USDgen/build --src $HOME/USDgen/src $HOME/USDinst -v
       displayName: 'Building USD'
     - bash: |
@@ -306,23 +306,23 @@ stages:
           PYTHON_INTERPRETER: python
         Mac_Python38:
           PYTHON_VERSION_SPEC: 3.8
-          IMAGE: 'macOS-12'
+          IMAGE: 'macOS-13'
           PYTHON_INTERPRETER: python3
         Mac_Python39:
           PYTHON_VERSION_SPEC: 3.9
-          IMAGE: 'macOS-12'
+          IMAGE: 'macOS-13'
           PYTHON_INTERPRETER: python3
         Mac_Python310:
           PYTHON_VERSION_SPEC: 3.10
-          IMAGE: 'macOS-12'
+          IMAGE: 'macOS-13'
           PYTHON_INTERPRETER: python3
         Mac_Python311:
           PYTHON_VERSION_SPEC: 3.11
-          IMAGE: 'macOS-12'
+          IMAGE: 'macOS-13'
           PYTHON_INTERPRETER: python3
         Mac_Python312:
           PYTHON_VERSION_SPEC: 3.12
-          IMAGE: 'macOS-12'
+          IMAGE: 'macOS-13'
           PYTHON_INTERPRETER: python3
     timeoutInMinutes: 10
     pool: