change arm-unknown-linux-gnueabihf to musl

Fixes #24
microsoft · Apr 5, 2023 · bc68756 · bc68756
1 parent 69afe02
commit bc68756
Show file tree

Hide file tree

Showing 2 changed files with 109 additions and 112 deletions.
diff --git a/build/main.yml b/build/main.yml
@@ -1,113 +1,113 @@
 jobs:
-- job: linux_64
-  pool:
-    vmImage: 'ubuntu-latest'
-  steps:
-    - template: linux.yml
-      parameters:
-        target: x86_64-unknown-linux-musl
-- job: linux_32
-  pool:
-    vmImage: 'ubuntu-latest'
-  steps:
-    - template: linux.yml
-      parameters:
-        target: i686-unknown-linux-musl
-- job: linux_arm
-  pool:
-    vmImage: 'ubuntu-latest'
-  steps:
-    - template: linux.yml
-      parameters:
-        target: arm-unknown-linux-gnueabihf
-- job: linux_aarch64
-  pool:
-    vmImage: 'ubuntu-latest'
-  steps:
-    - template: linux.yml
-      parameters:
-        target: aarch64-unknown-linux-gnu
-- job: linux_aarch64_musl
-  pool:
-    vmImage: 'ubuntu-latest'
-  steps:
-    - template: linux.yml
-      parameters:
-        target: aarch64-unknown-linux-musl
-- job: macOS
-  pool:
-    vmImage: macOS-latest
-  steps:
-    - template: linux.yml
-      parameters:
-        target: x86_64-apple-darwin
-- job: macOS_arm64
-  pool:
-    vmImage: macOS-latest
-  steps:
-    - template: linux.yml
-      parameters:
-        target: aarch64-apple-darwin
-        rust_version: nightly
-- job: win_64
-  pool:
-    vmImage: windows-2022
-  steps:
-    - template: windows.yml
-      parameters:
-        target: x86_64-pc-windows-msvc
-- job: win_32
-  pool:
-    vmImage: windows-2022
-  steps:
-    - template: windows.yml
-      parameters:
-        target: i686-pc-windows-msvc
-- job: win_arm64
-  pool:
-    vmImage: windows-2022
-  steps:
-    - template: windows.yml
-      parameters:
-        target: aarch64-pc-windows-msvc
-- job: ppc64le
-  pool:
-    vmImage: 'ubuntu-latest'
-  steps:
-    - template: linux.yml
-      parameters:
-        target: powerpc64le-unknown-linux-gnu
-- job: s390x
-  pool:
-    vmImage: 'ubuntu-latest'
-  steps:
-    - template: linux.yml
-      parameters:
-        target: s390x-unknown-linux-gnu
-- job: publish
-  pool:
-    vmImage: 'ubuntu-latest'
-  condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/v'))
-  dependsOn:
-  - linux_64
-  - linux_32
-  - linux_arm
-  - linux_aarch64
-  - linux_aarch64_musl
-  - macOS
-  - macOS_arm64
-  - win_64
-  - win_32
-  - win_arm64
-  - ppc64le
-  - s390x
-  steps:
-    - template: publish.yml
+  - job: linux_64
+    pool:
+      vmImage: "ubuntu-latest"
+    steps:
+      - template: linux.yml
+        parameters:
+          target: x86_64-unknown-linux-musl
+  - job: linux_32
+    pool:
+      vmImage: "ubuntu-latest"
+    steps:
+      - template: linux.yml
+        parameters:
+          target: i686-unknown-linux-musl
+  - job: linux_arm
+    pool:
+      vmImage: "ubuntu-latest"
+    steps:
+      - template: linux.yml
+        parameters:
+          target: arm-unknown-linux-musleabihf
+  - job: linux_aarch64
+    pool:
+      vmImage: "ubuntu-latest"
+    steps:
+      - template: linux.yml
+        parameters:
+          target: aarch64-unknown-linux-gnu
+  - job: linux_aarch64_musl
+    pool:
+      vmImage: "ubuntu-latest"
+    steps:
+      - template: linux.yml
+        parameters:
+          target: aarch64-unknown-linux-musl
+  - job: macOS
+    pool:
+      vmImage: macOS-latest
+    steps:
+      - template: linux.yml
+        parameters:
+          target: x86_64-apple-darwin
+  - job: macOS_arm64
+    pool:
+      vmImage: macOS-latest
+    steps:
+      - template: linux.yml
+        parameters:
+          target: aarch64-apple-darwin
+          rust_version: nightly
+  - job: win_64
+    pool:
+      vmImage: windows-2022
+    steps:
+      - template: windows.yml
+        parameters:
+          target: x86_64-pc-windows-msvc
+  - job: win_32
+    pool:
+      vmImage: windows-2022
+    steps:
+      - template: windows.yml
+        parameters:
+          target: i686-pc-windows-msvc
+  - job: win_arm64
+    pool:
+      vmImage: windows-2022
+    steps:
+      - template: windows.yml
+        parameters:
+          target: aarch64-pc-windows-msvc
+  - job: ppc64le
+    pool:
+      vmImage: "ubuntu-latest"
+    steps:
+      - template: linux.yml
+        parameters:
+          target: powerpc64le-unknown-linux-gnu
+  - job: s390x
+    pool:
+      vmImage: "ubuntu-latest"
+    steps:
+      - template: linux.yml
+        parameters:
+          target: s390x-unknown-linux-gnu
+  - job: publish
+    pool:
+      vmImage: "ubuntu-latest"
+    condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/v'))
+    dependsOn:
+      - linux_64
+      - linux_32
+      - linux_arm
+      - linux_aarch64
+      - linux_aarch64_musl
+      - macOS
+      - macOS_arm64
+      - win_64
+      - win_32
+      - win_arm64
+      - ppc64le
+      - s390x
+    steps:
+      - template: publish.yml
 
 trigger:
   branches:
-   include:
-   - main
+    include:
+      - main
   tags:
     include:
-    - v*
+      - v*
diff --git a/build/utils.sh b/build/utils.sh
@@ -26,8 +26,8 @@ architecture() {
         i686-*|i586-*|i386-*)
             echo i386
             ;;
-        arm*-unknown-linux-gnueabihf)
-            echo armhf
+        arm*-unknown-linux-musleabihf)
+            echo armhf-musl
             ;;
         aarch64-unknown-linux-gnu)
             echo aarch64
@@ -52,9 +52,6 @@ architecture() {
 
 gcc_prefix() {
     case "$(architecture)" in
-        armhf)
-            echo arm-linux-gnueabihf-
-            ;;
         aarch64)
             echo aarch64-linux-gnu-
             ;;