Treat Objective-C static analysis warnings as errors (microsoft#16293)

- Update Objective-C static analysis check to fail on warnings. - Address warning. - Clean up build definition.
justinchuby · Jun 9, 2023 · b668a6d · b668a6d
1 parent 443f553
commit b668a6d
Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/objectivec/include/ort_env.h b/objectivec/include/ort_env.h
@@ -16,7 +16,7 @@ extern "C" {
  *
  * Available since 1.15.
  */
-NSString* ORTVersion(void);
+NSString* _Nullable ORTVersion(void);
 
 #ifdef __cplusplus
 }

diff --git a/objectivec/ort_env.mm b/objectivec/ort_env.mm
@@ -12,9 +12,8 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-NSString* ORTVersion(void) {
-  std::string result = OrtGetApiBase()->GetVersionString();
-  return [NSString stringWithUTF8String:result.c_str()];
+NSString* _Nullable ORTVersion(void) {
+  return [NSString stringWithUTF8String:OrtGetApiBase()->GetVersionString()];
 }
 
 @implementation ORTEnv {

diff --git a/tools/ci_build/build.py b/tools/ci_build/build.py
@@ -542,11 +542,12 @@ def convert_arg_line_to_args(self, arg_line):
     parser.add_argument(
         "--cmake_generator",
         choices=[
-            "Visual Studio 16 2019",
-            "Visual Studio 17 2022",
-            "Ninja",
             "MinGW Makefiles",
+            "Ninja",
             "NMake Makefiles",
+            "Unix Makefiles",
+            "Visual Studio 16 2019",
+            "Visual Studio 17 2022",
             "Xcode",
         ],
         default=None,

diff --git a/tools/ci_build/github/apple/objectivec/static_analysis/requirements.txt b/tools/ci_build/github/apple/objectivec/static_analysis/requirements.txt
diff --git a/tools/ci_build/github/azure-pipelines/mac-objc-static-analysis-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/mac-objc-static-analysis-ci-pipeline.yml
@@ -17,14 +17,10 @@ jobs:
       addToPath: true
       architecture: "x64"
 
-  - script: |
-      pip install -r tools/ci_build/github/apple/objectivec/static_analysis/requirements.txt
-    displayName: Install tools
-
   - script: |
       python tools/ci_build/build.py \
         --build_dir "$(Build.BinariesDirectory)" \
-        --cmake_generator "Ninja" \
+        --cmake_generator "Unix Makefiles" \
         --config Debug \
         --build_shared_lib --use_coreml --build_objc \
         --cmake_extra_defines CMAKE_EXPORT_COMPILE_COMMANDS=ON \
@@ -33,9 +29,14 @@ jobs:
     displayName: Generate compile_commands.json and ONNX protobuf files
 
   - script: |
+      set -e
+
+      CLANG_TIDY_CHECKS="-*,clang-analyzer-*"
+
       "$(brew --prefix llvm@15)/bin/clang-tidy" \
         -p="$(Build.BinariesDirectory)/Debug" \
-        --checks="-*,clang-analyzer-*" \
+        --checks="${CLANG_TIDY_CHECKS}" \
+        --warnings-as-errors="${CLANG_TIDY_CHECKS}" \
         --header-filter="objectivec/include|objectivec|onnxruntime/core" \
         ./objectivec/*.mm \
         ./onnxruntime/core/platform/apple/logging/apple_log_sink.mm \