Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update pool to MacOS-13 #17361

Merged
merged 44 commits into from
Sep 17, 2024
Merged

Update pool to MacOS-13 #17361

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
acf9f65
Update pool to MacOS-13
jchen351 Aug 30, 2023
1af95ce
Merge branch 'main' into Cjian/macos13
jchen351 Nov 17, 2023
32d19a8
Merge branch 'refs/heads/main' into Cjian/macos13
jchen351 May 15, 2024
55a21b0
Merge remote-tracking branch 'origin/main' into Cjian/macos13
jchen351 Jun 21, 2024
912c9a5
update jave sdk from 11 to 17
jchen351 Jun 24, 2024
f820cf5
Use Xcode version 14.3 instead of
jchen351 Jun 24, 2024
3d3389e
14.3.1
jchen351 Jun 24, 2024
93ec7e2
macOS-13
jchen351 Jun 24, 2024
ee9dfc4
macOS-13
jchen351 Jun 24, 2024
53a03b1
Merge branch 'refs/heads/main' into Cjian/macos13
jchen351 Jun 26, 2024
f0ca208
update ios target to 15
jchen351 Jun 28, 2024
ffb6f5c
Merge remote-tracking branch 'origin/main' into Cjian/macos13
snnn Jun 29, 2024
c85fdd7
Merge branch 'refs/heads/main' into Cjian/macos13
jchen351 Jul 17, 2024
da23b72
Installing gcovr from apt-get
jchen351 Jul 17, 2024
ba098ad
Reverting podfile and project files
jchen351 Aug 22, 2024
2ac15bf
Merge branch 'refs/heads/main' into Cjian/macos13
jchen351 Aug 23, 2024
095761b
Merge remote-tracking branch 'refs/remotes/origin/main' into Cjian/ma…
jchen351 Aug 26, 2024
7fa3ac3
Merging back with the master
jchen351 Aug 26, 2024
8b2c66e
Remove xcodeVersion when they are using the default version
jchen351 Aug 26, 2024
6029138
Merge branch 'refs/heads/main' into Cjian/macos13
jchen351 Aug 26, 2024
45aa698
use-xcode-version.yml
jchen351 Aug 27, 2024
ae823f2
Trying Xcode 14.2 with the MacOS-13
jchen351 Aug 27, 2024
e264fae
Try to update to use ios simulator ios version 15
jchen351 Aug 27, 2024
416d697
Update the xcode project.pbxproj
jchen351 Aug 27, 2024
11916d4
Update targert iOS and MacOS in project setting
jchen351 Aug 30, 2024
6782c3c
Update targert iOS and MacOS in project setting
jchen351 Aug 30, 2024
fe1dd8e
Update targert iOS and MacOS in project setting
jchen351 Aug 30, 2024
21215b0
Update targert iOS and MacOS in project setting
jchen351 Aug 30, 2024
324755d
Try setting RCTBlobManager manually
jchen351 Aug 30, 2024
3b12d4a
Reverting the changes
jchen351 Aug 30, 2024
4e7291f
Set pod deployment target to 13.0
jchen351 Aug 30, 2024
572697c
Retry xcode 14.2 again
jchen351 Sep 3, 2024
02faf93
Retry xcode 14.3 with need post installer config
jchen351 Sep 3, 2024
df9ae3e
Apply fix for https://github.com/facebook/react-native/issues/32483
jchen351 Sep 4, 2024
dedeaad
Apply fix for https://github.com/facebook/react-native/issues/32483
jchen351 Sep 4, 2024
1296dd3
Update time.h
jchen351 Sep 4, 2024
0f29f75
Update project.pbxproj
jchen351 Sep 4, 2024
4ff2120
define iOS to 13.0 because default iOS version 17.2
jchen351 Sep 11, 2024
c70e7d7
define iOS to 13.0 because default iOS version 17.2
jchen351 Sep 11, 2024
c7d3de8
Change the simulator device type to iphone 11, because ios 13 cannot …
jchen351 Sep 11, 2024
183ccaa
Change the simulator device type to iphone 11, because the default iO…
jchen351 Sep 12, 2024
d11a6ef
Adding script to check the list of supported devices
jchen351 Sep 12, 2024
69c5eb6
iPhone 13 is no longer supported with current MacOS image so I am usi…
jchen351 Sep 12, 2024
6e5f286
Using iPhone 14 with iOS 16.4 for xcode Instrumented Tests
jchen351 Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 13 additions & 19 deletions tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ stages:
versionSpec: $(pythonVersion)

- task: JavaToolInstaller@0
displayName: Use jdk 11
displayName: Use jdk 17
inputs:
versionSpec: '11'
versionSpec: '17'
snnn marked this conversation as resolved.
Show resolved Hide resolved
jdkArchitectureOption: 'x64'
jdkSourceOption: 'PreInstalled'

Expand Down Expand Up @@ -152,9 +152,9 @@ stages:
versionSpec: $(pythonVersion)

- task: JavaToolInstaller@0
displayName: Use jdk 11
displayName: Use jdk 17
inputs:
versionSpec: '11'
versionSpec: '17'
jdkArchitectureOption: 'x64'
jdkSourceOption: 'PreInstalled'

Expand Down Expand Up @@ -218,9 +218,7 @@ stages:
jobs:
- job: Test_CPU_EP
pool:
# We need macOS-12 to run the Android emulator for now.
# https://github.com/actions/runner-images/issues/7671
vmImage: 'macOS-12'
vmImage: 'macOS-13'
workspace:
clean: all
condition: succeeded()
Expand Down Expand Up @@ -249,9 +247,9 @@ stages:
versionSpec: $(pythonVersion)

- task: JavaToolInstaller@0
displayName: Use jdk 11
displayName: Use jdk 17
inputs:
versionSpec: '11'
versionSpec: '17'
jdkArchitectureOption: 'x64'
jdkSourceOption: 'PreInstalled'

Expand Down Expand Up @@ -282,9 +280,7 @@ stages:

- job: Test_NNAPI_EP
pool:
# We need macOS-12 to run the Android emulator for now.
# https://github.com/actions/runner-images/issues/7671
vmImage: 'macOS-12'
vmImage: 'macOS-13'
timeoutInMinutes: 90
workspace:
clean: all
Expand Down Expand Up @@ -314,9 +310,9 @@ stages:
versionSpec: $(pythonVersion)

- task: JavaToolInstaller@0
displayName: Use jdk 11
displayName: Use jdk 17
inputs:
versionSpec: '11'
versionSpec: '17'
jdkArchitectureOption: 'x64'
jdkSourceOption: 'PreInstalled'

Expand Down Expand Up @@ -363,9 +359,7 @@ stages:
jobs:
- job: NNAPI_EP_MASTER
pool:
# We need macOS-12 to run the Android emulator for now.
# https://github.com/actions/runner-images/issues/7671
vmImage: 'macOS-12'
vmImage: 'macOS-13'
timeoutInMinutes: 180
workspace:
clean: all
Expand All @@ -382,9 +376,9 @@ stages:
versionSpec: $(pythonVersion)

- task: JavaToolInstaller@0
displayName: Use jdk 11
displayName: Use jdk 17
inputs:
versionSpec: '11'
versionSpec: '17'
jdkArchitectureOption: 'x64'
jdkSourceOption: 'PreInstalled'

Expand Down
8 changes: 3 additions & 5 deletions tools/ci_build/github/azure-pipelines/templates/android-java-api-aar-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ jobs:
workspace:
clean: all
pool:
# We need macOS-12 to run the Android emulator for now.
# https://github.com/actions/runner-images/issues/7671
vmImage: 'macOS-12'
vmImage: 'macOS-13'
variables:
- name: runCodesignValidationInjection
value: false
Expand All @@ -39,9 +37,9 @@ jobs:
targetPath: '$(Build.BinariesDirectory)/final-android-aar'

- task: JavaToolInstaller@0
displayName: Use jdk 11
displayName: Use jdk 17
inputs:
versionSpec: '11'
versionSpec: '17'
jdkArchitectureOption: 'x64'
jdkSourceOption: 'PreInstalled'

Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ stages:

- template: use-xcode-version.yml
parameters:
xcodeVersion: 14.2
xcodeVersion: 14.3

- template: download-deps.yml

Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/azure-pipelines/templates/mac-cpu-packing-jobs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:

- template: use-xcode-version.yml
parameters:
xcodeVersion: 14.2
xcodeVersion: 14.3

- template: download-deps.yml

Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ stages:

- template: use-xcode-version.yml
parameters:
xcodeVersion: 14.2
xcodeVersion: 14.3

- template: download-deps.yml

Expand Down
8 changes: 3 additions & 5 deletions tools/ci_build/github/azure-pipelines/templates/react-native-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,7 @@ stages:
jobs:
- job: ReactNative_CI
pool:
# We need macOS-12 to run the Android emulator for now.
# https://github.com/actions/runner-images/issues/7671
vmImage: 'macOS-12'
vmImage: 'macOS-13'
variables:
runCodesignValidationInjection: false
timeoutInMinutes: 90
Expand All @@ -118,9 +116,9 @@ stages:
architecture: "x64"

- task: JavaToolInstaller@0
displayName: Use jdk 11
displayName: Use jdk 17
inputs:
versionSpec: '11'
versionSpec: '17'
jdkArchitectureOption: 'x64'
jdkSourceOption: 'PreInstalled'

Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/azure-pipelines/templates/stages/mac-ios-packaging-build-stage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ stages:
vmImage: "macOS-latest"

variables:
xcodeVersion: "14.2"
xcodeVersion: "14.3"
jchen351 marked this conversation as resolved.
Show resolved Hide resolved
ortPodVersion: $[stageDependencies.IosPackaging_SetCommonVariables.j.outputs['SetCommonVariables.ORT_POD_VERSION']]

${{ if eq(parameters.packageVariant, 'Full') }}:
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/azure-pipelines/templates/use-xcode-version.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
parameters:
- name: xcodeVersion
type: string
default: "14.2"
default: "14.3"

steps:
- bash: |
Expand Down
Loading