Skip to content

Commit

Permalink
ci: Switch to rustup over 3rd party action
Browse files Browse the repository at this point in the history
Also disable Linux arm builds for now, the Docker images they use are very old.
  • Loading branch information
hrkfdn committed Feb 4, 2024
1 parent f088149 commit fca6087
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 11 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
container: ${{ matrix.container }}
strategy:
matrix:
build_target: [linux-x86_64, linux-arm64, linux-armhf, macos-x86_64, macos-aarch64, windows-x86_64]
build_target: [linux-x86_64, macos-x86_64, macos-aarch64, windows-x86_64]
include:
- build_target: linux-x86_64
os: ubuntu-latest
Expand Down Expand Up @@ -54,10 +54,7 @@ jobs:
features: '--no-default-features --features rodio_backend,pancurses_backend,share_clipboard,notify'
steps:
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable
with:
target: ${{ matrix.target }}
toolchain: stable
run: rustup target add ${{ matrix.target }}
- name: Install macOS dependencies
if: matrix.os == 'macos-latest'
run: brew install portaudio pkg-config
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
build_target: [linux, macos-x86_64, macos-aarch64, windows]
build_target: [linux-x86_64, macos-x86_64, macos-aarch64, windows]
include:
- build_target: linux
- build_target: linux-x86_64
os: ubuntu-latest
artifact_suffix: linux-x86_64
target: x86_64-unknown-linux-gnu
Expand Down Expand Up @@ -48,10 +48,9 @@ jobs:
target/
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable
with:
target: ${{ matrix.target }}
components: clippy, rustfmt
run: rustup target add ${{ matrix.target }}
- name: Install clippy + rustfmt
run: rustup component add clippy rustfmt
- name: Install macOS dependencies
if: matrix.os == 'macos-latest'
run: brew install portaudio pkg-config
Expand Down

0 comments on commit fca6087

Please sign in to comment.