Skip to content

Commit 5bc41bb

Browse files
authored
Merge pull request #20974 from Homebrew/arm_tier_1
Make Linux ARM64/AARCH64 Tier 1 supported
2 parents cd3564b + 8f9650c commit 5bc41bb

File tree

4 files changed

+6
-12
lines changed

4 files changed

+6
-12
lines changed

.github/workflows/docker.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -206,10 +206,6 @@ jobs:
206206

207207
- name: Set environment variables
208208
run: |
209-
if [[ "${ARCH}" == "arm64" ]]; then
210-
echo "HOMEBREW_ARM64_TESTING=1" >> "$GITHUB_ENV"
211-
fi
212-
213209
# odeprecated: remove 20.04 in Homebrew >=4.7
214210
if [[ "${VERSION}" == "20.04" ]]; then
215211
echo "HOMEBREW_GLIBC_TESTING=1" >> "$GITHUB_ENV"
@@ -219,7 +215,7 @@ jobs:
219215
ARCH: ${{ matrix.arch }}
220216

221217
- name: Run brew test-bot --only-setup
222-
run: docker run --env HOMEBREW_ARM64_TESTING --env HOMEBREW_GLIBC_TESTING --rm brew brew test-bot --only-setup
218+
run: docker run --env HOMEBREW_GLIBC_TESTING --rm brew brew test-bot --only-setup
223219

224220
- name: Log in to GitHub Packages (BrewTestBot)
225221
if: fromJSON(steps.attributes.outputs.push)

.github/workflows/tests.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -391,9 +391,7 @@ jobs:
391391
- name: Setup environment variables
392392
run: |
393393
# Set enviroment variables to bypass `brew doctor` failures on Tier >=2 configurations
394-
if [[ "${MATRIX_NAME}" == "test-bot (Linux arm64)" ]]; then
395-
echo "HOMEBREW_ARM64_TESTING=1" >> "$GITHUB_ENV"
396-
elif [[ "${MATRIX_NAME}" == "test-bot (Linux Homebrew glibc)" ]]; then
394+
if [[ "${MATRIX_NAME}" == "test-bot (Linux Homebrew glibc)" ]]; then
397395
echo "HOMEBREW_GLIBC_TESTING=1" >> "$GITHUB_ENV"
398396
fi
399397
env:

Library/Homebrew/extend/os/linux/diagnostic.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@ def check_umask_not_zero
8282
sig { returns(T.nilable(String)) }
8383
def check_supported_architecture
8484
return if ::Hardware::CPU.intel?
85-
return if Homebrew::EnvConfig.developer? && ENV["HOMEBREW_ARM64_TESTING"].present? && ::Hardware::CPU.arm?
85+
return if ::Hardware::CPU.arm? && ::Hardware::CPU.is_64_bit?
8686

8787
<<~EOS
8888
Your CPU architecture (#{::Hardware::CPU.arch}) is not supported. We only support
89-
x86_64 CPU architectures. You will be unable to use binary packages (bottles).
89+
x86_64 or ARM64/AArch64 CPU architectures. You will be unable to use binary packages (bottles).
9090
9191
#{support_tier_message(tier: 2)}
9292
EOS

docs/Support-Tiers.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ For Tier 1 support, Homebrew on Linux must be all of:
4040
- have a Linux kernel >= 3.2
4141
- if running Ubuntu, using an Ubuntu version in "standard support": <https://ubuntu.com/about/release-cycle>
4242
- installed in the default prefix (i.e. `/home/linuxbrew/.linuxbrew`)
43-
- running on a supported architecture (i.e. Intel x86_64)
43+
- running on a supported architecture (i.e. Intel x86_64 or ARM64/AArch64)
4444
- not building official packages from source
4545
- you have `sudo` access on your system
4646

@@ -61,7 +61,7 @@ Tier 2 configurations include:
6161
- Linux versions with a system `glibc` version < 2.35 (but >= 2.13), requiring the Homebrew `glibc` formula to be installed automatically
6262
- using official packages that need to be built from source due to installing Homebrew outside the default prefix
6363
(i.e. `/opt/homebrew` on Apple Silicon, `/usr/local` on Apple Intel x86_64, `/home/linuxbrew/.linuxbrew` for Linux)
64-
- running on a not-yet-supported architecture (i.e. Linux ARM64/AARCH64)
64+
- running on a not-yet-supported architecture
6565
- devices using OpenCore Legacy Patcher with a Westmere or newer Intel CPU
6666

6767
## Tier 3

0 commit comments

Comments
 (0)