Skip to content

Commit

Permalink
Delegate smaller tasks to mac runner
Browse files Browse the repository at this point in the history
  • Loading branch information
bugadani committed Jan 31, 2025
1 parent c74d614 commit e77a91f
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 13 deletions.
29 changes: 17 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ jobs:
toolchain: ${{ matrix.device.toolchain }}

extras:
runs-on: ubuntu-latest
runs-on: macos-m1-self-hosted

steps:
- uses: actions/checkout@v4
Expand All @@ -97,8 +97,6 @@ jobs:
toolchain: stable
- uses: Swatinem/rust-cache@v2

- name: Install dependencies
run: sudo apt-get update && sudo apt-get -y install musl-tools libudev-dev pkg-config
# Build the extra crates
- name: Build the bench-server
run: cd extras/bench-server && cargo build
Expand All @@ -111,21 +109,28 @@ jobs:
# MSRV

msrv:
runs-on: ubuntu-latest
env:
RUSTC_BOOTSTRAP: 1
runs-on: macos-m1-self-hosted

steps:
- uses: actions/checkout@v4
- uses: esp-rs/[email protected]
with:
ldproxy: false
version: ${{ env.MSRV }}
- uses: dtolnay/rust-toolchain@v1
with:
target: riscv32imc-unknown-none-elf,riscv32imac-unknown-none-elf
toolchain: ${{ env.MSRV }}
components: rust-src
- name: install esp toolchain
run: |
if [ ! -f "$HOME/.cargo/bin/espup" ]; then
curl -L https://github.com/esp-rs/espup/releases/latest/download/espup-aarch64-apple-darwin -o "$HOME/.cargo/bin/espup"
chmod a+x "$HOME/.cargo/bin/espup"
fi
source "$HOME/.cargo/env"
"$HOME/.cargo/bin/espup" install -l debug --export-file $HOME/exports --targets all --toolchain-version 1.84.0.0
source "$HOME/exports"
echo "$PATH" >> "$GITHUB_PATH"
echo "LIBCLANG_PATH=${LIBCLANG_PATH}" >> "$GITHUB_ENV"
rustup override unset
- uses: Swatinem/rust-cache@v2

# Verify the MSRV for all RISC-V chips.
Expand Down Expand Up @@ -166,7 +171,7 @@ jobs:
# Format

rustfmt:
runs-on: ubuntu-latest
runs-on: macos-m1-self-hosted

steps:
- uses: actions/checkout@v4
Expand All @@ -185,7 +190,7 @@ jobs:
# host tests

host-tests:
runs-on: ubuntu-latest
runs-on: macos-m1-self-hosted

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/hil.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ env:
jobs:
build-xtasks:
name: Build xtasks | ${{ matrix.host.arch }}
runs-on: ubuntu-latest
runs-on: macos-m1-self-hosted

strategy:
fail-fast: false
Expand Down

0 comments on commit e77a91f

Please sign in to comment.