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.

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

Upgrade current MacOS-13 to 14 #23293

Merged
merged 27 commits into from
Mar 18, 2025
Merged

Upgrade current MacOS-13 to 14 #23293

merged 27 commits into from
Mar 18, 2025

Conversation

jchen351
Copy link
Contributor

@jchen351 jchen351 commented Jan 8, 2025

Description

Upgrade current MacOS-13 to 14

Motivation and Context

  • Update the RN to 0.73.x+ to have the newer version of boost

Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can commit the suggested changes from lintrunner.

Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can commit the suggested changes from lintrunner.

@jchen351
Copy link
Contributor Author

This PR might need to update the RN to 0.73.x so we can get the updated boost. Current boost is using a deprecated syntax that was eventually removed from C++17

boost/boost/container_hash/hash.hpp:131:33: error: no template named 'unary_function' in namespace 'std'; did you mean '__unary_function'?
        struct hash_base : std::unary_function<T, std::size_t> {};
                           ~~~~~^~~~~~~~~~~~~~

# Conflicts:
#	.github/workflows/mac.yml
#	js/react_native/e2e/ios/OnnxruntimeModuleExample.xcodeproj/project.pbxproj
#	js/react_native/e2e/ios/Podfile
#	js/react_native/ios/OnnxruntimeModule.xcodeproj/project.pbxproj
#	js/react_native/ios/Podfile
#	tools/ci_build/github/azure-pipelines/mac-ios-packaging-pipeline.yml
#	tools/ci_build/github/azure-pipelines/templates/android-java-api-aar-test.yml
#	tools/ci_build/github/azure-pipelines/templates/react-native-ci.yml
#	tools/ci_build/github/azure-pipelines/templates/stages/mac-ios-packaging-build-stage.yml
…OWED >= 130000 && __IPHONE_OS_VERSION_MAX_ALLOWED >= 160000)
# Conflicts:
#	tools/ci_build/github/azure-pipelines/mac-coreml-ci-pipeline.yml
#	tools/ci_build/github/azure-pipelines/mac-ios-ci-pipeline.yml
#	tools/ci_build/github/azure-pipelines/stages/py-cpu-packaging-stage.yml
#	tools/ci_build/github/azure-pipelines/templates/react-native-ci.yml
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can commit the suggested changes from lintrunner.

@jchen351 jchen351 merged commit e495750 into main Mar 18, 2025
89 of 92 checks passed
@jchen351 jchen351 deleted the Cjian/macos_14 branch March 18, 2025 22:24
@snnn
Copy link
Member

snnn commented Mar 19, 2025

Please also help us upgrade the Gtihub Action pipelines to MacOS 14.
The yaml files are in this folder: https://github.com/microsoft/onnxruntime/tree/main/.github/workflows

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants