all to x86

ZhiHanZ · Oct 25, 2021 · 2ae14ea · 2ae14ea
1 parent 481b7c3
commit 2ae14ea
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/databend-release.yml b/.github/workflows/databend-release.yml
@@ -22,8 +22,9 @@ jobs:
           - {os: ubuntu-latest, toolchain: stable, target: x86_64-unknown-linux-gnu, cross: false}
           - {os: ubuntu-latest, toolchain: stable, target: aarch64-unknown-linux-gnu, cross: true}
           # Macos
-          - {os: macos-11, toolchain: stable, target: x86_64-apple-darwin, cross: false}
           - {os: macos-11, toolchain: stable, target: aarch64-apple-darwin, cross: false}
+          - {os: macos-11, toolchain: stable, target: x86_64-apple-darwin, cross: false}
+
     steps:
       - name: Checkout
         uses: actions/checkout@v2

diff --git a/cli/src/cmds/packages/fetch.rs b/cli/src/cmds/packages/fetch.rs
@@ -84,6 +84,10 @@ pub fn get_rust_architecture() -> Result<String> {
     }
 
     // Check rosetta
+    let (_, rosetta, _) = run_script::run_script!(r#"uname -a"#)?;
+    if rosetta.contains("Darwin") && rosetta.contains("arm64") {
+        return Ok("x86_64-apple-darwin".to_string());
+    }
     let os = match os {
         "darwin" => "apple-darwin".to_string(),
         "macos" => "apple-darwin".to_string(),

diff --git a/scripts/installer/install-bendctl.sh b/scripts/installer/install-bendctl.sh
@@ -355,7 +355,7 @@ assert_supported_architecture() {
             return 0
             ;;
         aarch64-apple-darwin)
-            echo "aarch64-apple-darwin"
+            echo "x86_64-apple-darwin"
             return 0
             ;;
         *)