Skip to content

Commit

Permalink
other: promote macOS aarch64 to official support
Browse files Browse the repository at this point in the history
Since I have a macOS M1 laptop to test on now, I think it's a good time
to bump it to be officially supported, especially since it's going
to be the main macOS platform for the foreseeable feature.
  • Loading branch information
ClementTsang committed Feb 19, 2023
1 parent f89b243 commit c0f8468
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_releases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
cross: true,
}

# macOS (x64)
# macOS (x64), M1 is built via CirrusCI.
- { os: "macos-12", target: "x86_64-apple-darwin", cross: false }

# Windows (x64, x86)
Expand Down
14 changes: 8 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ jobs:
do_not_skip: '["workflow_dispatch", "push"]'

# Runs rustfmt + tests + clippy on the main supported platforms.
#
# Note that m1 macOS is tested via CirrusCI.
supported:
needs: pre-job
runs-on: ${{ matrix.info.os }}
Expand All @@ -71,6 +73,12 @@ jobs:
target: "aarch64-unknown-linux-gnu",
cross: true,
}
- {
os: "ubuntu-latest",
target: "i686-unknown-linux-gnu",
cross: true,
rust: stable,
}
- { os: "macos-12", target: "x86_64-apple-darwin", cross: false }
- {
os: "windows-2019",
Expand Down Expand Up @@ -140,12 +148,6 @@ jobs:
matrix:
info:
# x86 or x64
- {
os: "ubuntu-latest",
target: "i686-unknown-linux-gnu",
cross: true,
rust: stable,
}
- {
os: "ubuntu-latest",
target: "x86_64-unknown-linux-musl",
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.event_name == 'pull_request' || github.repository != 'ClementTsang/bottom' }}

# TODO: Maybe add this for more than just Linux.
jobs:
pre-job:
runs-on: ubuntu-latest
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Changes

- [#1025](https://github.com/ClementTsang/bottom/pull/1025): Officially support M1 macOS.

## Other

## [0.8.0] - 2023-01-22
Expand Down
9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ You can find more details in [the documentation](https://clementtsang.github.io/

bottom _officially_ supports the following operating systems and corresponding architectures:

- macOS (`x86_64`)
- macOS (`x86_64`, `aarch64`)
- Linux (`x86_64`, `i686`, `aarch64`)
- Windows (`x86_64`, `i686`)

Expand All @@ -117,13 +117,12 @@ bottom may work on a number of platforms that aren't officially supported. Note
- Might not be properly tested by maintainers prior to a stable release.
- May only receive limited support, such as missing features or bugs that may not be fixed.

Note that some unsupported platforms may eventually be officially supported (e.g., FreeBSD, M1 macOS devices).
Note that some unsupported platforms may eventually be officially supported (e.g., FreeBSD).

A non-comprehensive list of some currently unofficially supported platforms that may compile/work include:

- FreeBSD on `x86_64`
- Linux on `armv6`, `armv7`, `powerpc64le`, `riscv64gc`
- macOS on `aarch64`
- FreeBSD (`x86_64`)
- Linux (`armv6`, `armv7`, `powerpc64le`, `riscv64gc`)

For more details on unsupported platforms and known problems, check out [the documentation](https://clementtsang.github.io/bottom/nightly/support/unofficial/).

Expand Down
2 changes: 1 addition & 1 deletion docs/content/support/official.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

bottom _officially_ supports the following operating systems and corresponding architectures:

- macOS (`x86_64`)
- macOS (`x86_64`, `aarch64`)
- Linux (`x86_64`, `i686`, `aarch64`)
- Windows (`x86_64`, `i686`)

Expand Down
8 changes: 4 additions & 4 deletions docs/content/support/unofficial.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Unofficial support

Systems and architectures that aren't officially supported may still work, but there are no guarantees on how much will work. For example, it might only compile, or it might run with bugs/broken features.
Furthermore, while it will depend on the problem at the end of the day, _issues on unsupported platforms are likely to go unfixed_.
Systems and architectures that aren't officially supported may still work, but there are no guarantees on how much will
work. For example, it might only compile, or it might run with bugs/broken features. Furthermore, while it will depend
on the problem at the end of the day, _issues on unsupported platforms are likely to go unfixed_.

Unofficially supported platforms known to compile/work:

- FreeBSD
- Linux on ARMv7 and ARMv6 (tested to compile in [CI](https://github.com/ClementTsang/bottom/blob/master/.github/workflows/ci.yml))
- macOS on AArch64 (tested to compile in [CI](https://github.com/ClementTsang/bottom/blob/master/.github/workflows/ci.yml))
- Linux on PowerPC 64 LE (tested to compile in [CI](https://github.com/ClementTsang/bottom/blob/master/.github/workflows/ci.yml))
- Linux on an RISC-V (tested to compile in [CI](https://github.com/ClementTsang/bottom/blob/master/.github/workflows/ci.yml), tested to run on an [Allwinner D1 Nezha](https://github.com/ClementTsang/bottom/issues/564))
- FreeBSD

## Known problems

Expand Down

0 comments on commit c0f8468

Please sign in to comment.