Skip to content

Commit

Permalink
revert: arm64 linux nightlies (#694) (#703)
Browse files Browse the repository at this point in the history
This reverts commit 2834702.
  • Loading branch information
onbjerg authored Feb 8, 2022
1 parent 2834702 commit 28f6d91
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 22 deletions.
12 changes: 1 addition & 11 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
11 changes: 0 additions & 11 deletions cli/src/cmd/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
Expand Down

0 comments on commit 28f6d91

Please sign in to comment.