Skip to content

Patch Protobuf and ONNX's cmake files and enforce BinSkim check#13694

Merged
snnn merged 8 commits into
mainfrom
snnn/add_m365
Nov 18, 2022
Merged

Patch Protobuf and ONNX's cmake files and enforce BinSkim check#13694
snnn merged 8 commits into
mainfrom
snnn/add_m365

Conversation

@snnn
Copy link
Copy Markdown
Contributor

@snnn snnn commented Nov 18, 2022

Description

Patch Protobuf and ONNX's cmake files and enforce BinSkim check.

This PR has overlap with #13523 . I would prefer to get this one merged first so that we can finished the BinSkim work, and I try to make this PR as small as possible.

Motivation and Context

@snnn snnn requested a review from a team November 18, 2022 15:30
msBuildCommandline: '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\amd64\msbuild.exe" "$(Build.BinariesDirectory)\Debug\onnxruntime.sln" /p:platform="$(MsbuildPlatform)" /p:configuration=Debug /p:VisualStudioVersion="16.0" /m /p:PreferredToolArchitecture=x64'
excludedPaths: '$(Build.BinariesDirectory)#$(Build.SourcesDirectory)\cmake#C:\program files (x86)'

- task: PostAnalysis@2
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This is the main change I want to add. All others are for making this task pass.

@snnn snnn merged commit 3e9e5e9 into main Nov 18, 2022
@snnn snnn deleted the snnn/add_m365 branch November 18, 2022 18:09
snnn pushed a commit that referenced this pull request Nov 22, 2022
… source on MacOS (#13720)

### Description
Add '-DCMAKE_OSX_ARCHITECTURES=x86_64;arm64' when build protobuf from
source on MacOS. Because later on we will the built library with the
other parts of onnxruntime to generate libonnxruntime.dylib, and if the
target CPU ARCH of libonnxruntime.dylib is not x86_64, it will fail.

### Motivation and Context
To fix a packaging pipeline failure, which was introduced from #13694
simon-moo pushed a commit to simon-moo/onnxruntime that referenced this pull request Dec 26, 2022
…osoft#13694)

Patch Protobuf and ONNX's cmake files and enforce BinSkim check.

This PR has overlap with microsoft#13523 . I would prefer to get this one merged
first so that we can finished the BinSkim work, and I try to make this
PR as small as possible.
simon-moo pushed a commit to simon-moo/onnxruntime that referenced this pull request Dec 26, 2022
… source on MacOS (microsoft#13720)

### Description
Add '-DCMAKE_OSX_ARCHITECTURES=x86_64;arm64' when build protobuf from
source on MacOS. Because later on we will the built library with the
other parts of onnxruntime to generate libonnxruntime.dylib, and if the
target CPU ARCH of libonnxruntime.dylib is not x86_64, it will fail.

### Motivation and Context
To fix a packaging pipeline failure, which was introduced from microsoft#13694
rui-ren pushed a commit that referenced this pull request Jan 19, 2023
…CPU_x86_default (#14332)

### Description
Allows the PostAnalysis@2 task for windows CI jobs to continue even if
an error is encountered.


### Motivation and Context
This is a temporary workaround that enables the
`Windows_Packaging_CPU_x86_default` job within the Zip-Nuget-Java-NodeJS
packaging pipeline to finish. A recent update to dotnet 6 has broken the
PostAnalysis task for this job.

This task was originally added by
#13694
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.

2 participants