From b93686a066ea8873b20b733bc1397f23574ab1fa Mon Sep 17 00:00:00 2001 From: Bjerg Date: Tue, 8 Feb 2022 09:30:29 +0100 Subject: [PATCH] Revert "ci: build arm64 linux nightlies (#694)" This reverts commit 28347027a40a6ac65de2c4fbf8f129821675e8d2. --- .github/workflows/release.yml | 12 +----------- cli/src/cmd/build.rs | 11 ----------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bf527b910b5f..266a72904bcb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -72,15 +72,11 @@ jobs: # The OS is used for the runner # The platform is a generic platform name # The target is used by Cargo - # The arch is either 386, arm64 or amd64 + # The arch is either 386 or amd64 - os: ubuntu-latest platform: linux target: x86_64-unknown-linux-gnu arch: amd64 - - os: ubuntu-latest - platform: linux - target: aarch64-unknown-linux-gnu - arch: arm64 - os: macos-latest platform: darwin target: x86_64-apple-darwin @@ -116,12 +112,6 @@ jobs: echo "SDKROOT=$(xcrun -sdk macosx --show-sdk-path)" >> $GITHUB_ENV echo "MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx --show-sdk-platform-version)" >> $GITHUB_ENV - - name: Linux ARM setup - if: ${{ matrix.job.target == 'aarch64-unknown-linux-gnu' }} - run: | - sudo apt-get update -y - sudo apt-get install -y gcc-aarch64-linux-gnu - - name: Build binaries env: RUSTFLAGS: -C link-args=-s diff --git a/cli/src/cmd/build.rs b/cli/src/cmd/build.rs index 62872ad3acd2..214a2051db07 100644 --- a/cli/src/cmd/build.rs +++ b/cli/src/cmd/build.rs @@ -197,21 +197,10 @@ impl Provider for BuildArgs { dict.insert("libs".to_string(), libs.into()); } - #[cfg(not(target_arch = "aarch64"))] if self.no_auto_detect { dict.insert("auto_detect_solc".to_string(), false.into()); } - #[cfg(target_arch = "aarch64")] - { - if !self.no_auto_detect { - println!("Solidity compiler autodetection is disabled on ARM."); - println!("You can track progress on ARM support in https://github.com/gakonst/foundry/issues/525"); - println!("To silence this warning use --no-auto-detect"); - } - dict.insert("auto_detect_solc".to_string(), false.into()); - } - if self.force { dict.insert("force".to_string(), self.force.into()); }