[CI] Upgrade macos environment and Xcode/SDK

glandium · Jul 27, 2022 · ccb46cf · ccb46cf
1 parent 9d012c8
commit ccb46cf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/taskcluster.yml b/.github/workflows/taskcluster.yml
@@ -2,7 +2,7 @@ name: taskcluster extra workers
 on: [push]
 jobs:
  osx:
- runs-on: macos-10.15
+ runs-on: macos-11
  env:
  secret: ${{ secrets.SECRET }}
  TC_WORKER_TYPE: osx

diff --git a/CI/osx.py b/CI/osx.py
@@ -25,11 +25,12 @@ def prepare_params(self, params):
  command.extend(params['command'])
  params['command'] = bash_command(*command)
  env = params.setdefault('env', {})
- dev = env.setdefault('DEVELOPER_DIR',
- '/Applications/Xcode_11.7.app/Contents/Developer')
+ dev = env.setdefault(
+ 'DEVELOPER_DIR',
+ '/Applications/Xcode_13.2.1.app/Contents/Developer')
  env.setdefault(
  'SDKROOT',
- '{}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk'
+ '{}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.1.sdk'
  .format(dev))
  return params
 
@@ -50,10 +51,11 @@ class OsxArm64(OsxCommon, metaclass=TaskEnvironment):
 
  def prepare_params(self, params):
  env = params.setdefault('env', {})
- dev = env.setdefault('DEVELOPER_DIR',
- '/Applications/Xcode_12.2.app/Contents/Developer')
+ dev = env.setdefault(
+ 'DEVELOPER_DIR',
+ '/Applications/Xcode_13.2.1.app/Contents/Developer')
  env.setdefault(
  'SDKROOT',
- '{}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk'
+ '{}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.1.sdk'
  .format(dev))
  return super(OsxArm64, self).prepare_params(params)