From 8d8670f7e87e9bb456b4b017879e8e4bb5aedfe3 Mon Sep 17 00:00:00 2001
From: Wenbing Li <10278425+wenbingl@users.noreply.github.com>
Date: Fri, 24 May 2024 14:12:27 -0700
Subject: [PATCH] Fix the Linux and MacOS wheel build for packaging issues
 (#727)

* Update wheels_macos.yml

* remove mulslinux support

* Update wheels_linux.yml

* Update wheels_linux.yml

* remove appcenter testing
---
 .pipelines/android_packaging.yml | 13 -------------
 .pipelines/wheels_linux.yml      |  3 ++-
 .pipelines/wheels_macos.yml      |  1 +
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/.pipelines/android_packaging.yml b/.pipelines/android_packaging.yml
index af5aae514..05fe1cb9c 100644
--- a/.pipelines/android_packaging.yml
+++ b/.pipelines/android_packaging.yml
@@ -63,19 +63,6 @@ jobs:
               ./gradlew connectedDebugAndroidTest --no-daemon -DortExtensionsAarLocalPath="${ORT_EXTENSIONS_AAR_PATH}"
             displayName: Build and run onnxruntime-extensions Android test with Android Emulator
 
-      - script: |
-          set -e -x
-
-          appcenter test run espresso \
-            --app "AI-Frameworks/Ort-Ext-Mobile-Android-Testapp" \
-            --devices $(app_center_android_test_devices) \
-            --app-path $(Build.BinariesDirectory)/android_test/app/build/outputs/apk/debug/app-debug.apk \
-            --test-series "master" \
-            --locale "en_US" \
-            --build-dir $(Build.BinariesDirectory)/android_test/app/build/outputs/apk/androidTest/debug \
-            --token $(app_center_api_token)
-        displayName: Run onnxruntime-extensions Android test using App Center
-
       - bash: |
           set -e -x
 
diff --git a/.pipelines/wheels_linux.yml b/.pipelines/wheels_linux.yml
index bfaca8af9..a68849093 100644
--- a/.pipelines/wheels_linux.yml
+++ b/.pipelines/wheels_linux.yml
@@ -10,6 +10,7 @@ jobs:
   pool: {name: 'Azure-Pipelines-EO-Ubuntu-2004-aiinfra'}
   variables:
     CIBW_BUILD: "cp3{8,9,10,11,12}-*"
+    CIBW_SKIP: "*musllinux*"
     CIBW_ENVIRONMENT: "${{ parameters.ExtraEnv }}"
 
   steps:
@@ -30,7 +31,7 @@ jobs:
   pool: {name: 'Azure-Pipelines-EO-Ubuntu-2004-aiinfra'}
   variables:
     CIBW_BUILD: "cp3{8,9,10,11,12}-*"
-    CIBW_SKIP: "*musllinux_aarch64*"
+    CIBW_SKIP: "*musllinux_*"
     # AzureOp doesn't support aaarch64 yet.
     # CIBW_ENVIRONMENT: "${{ parameters.ExtraEnv }}"
 
diff --git a/.pipelines/wheels_macos.yml b/.pipelines/wheels_macos.yml
index a617e7cdb..2d377a9f1 100644
--- a/.pipelines/wheels_macos.yml
+++ b/.pipelines/wheels_macos.yml
@@ -6,6 +6,7 @@ jobs:
   variables:
     CIBW_BUILD: "cp3{8,9,10,11,12}-*"
     CIBW_ARCHS_MACOS: "x86_64 universal2 arm64"
+    CIBW_ENVIRONMENT: "MACOSX_DEPLOYMENT_TARGET=11.0"
     # Skip trying to test arm64 builds on Intel Macs
     # CIBW_TEST_SKIP: "*-macosx_arm64 *-macosx_universal2:arm64"
     # Disable building PyPy wheels