Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use self-hosted mac mini for the small, auxiliary tasks #3072

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shall we wait for the xtensa toolchain action to be updated before merging with this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's, this is a bit of an eyesore

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can anyone greenlight it? esp-rs/xtensa-toolchain#33

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
27 changes: 13 additions & 14 deletions .github/workflows/hil.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,9 @@ env:

jobs:
build-xtasks:
name: Build xtasks | ${{ matrix.host.arch }}
name: Build xtasks
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
host:
- arch: armv7
rust-target: armv7-unknown-linux-gnueabihf
- arch: aarch64
rust-target: aarch64-unknown-linux-gnu

steps:
- uses: actions/checkout@v4
if: github.event_name != 'workflow_dispatch'
Expand All @@ -60,13 +51,21 @@ jobs:
run: cargo install cross

- name: Build xtasks
run: cross build --release --target ${{ matrix.host.rust-target }} -p xtask
run: |
cross build --release --target armv7-unknown-linux-gnueabihf -p xtask
cross build --release --target aarch64-unknown-linux-gnu -p xtask

- name: Upload artifact | armv7-unknown-linux-gnueabihf
uses: actions/upload-artifact@v4
with:
name: xtask-armv7
path: target/armv7-unknown-linux-gnueabihf/release/xtask

- name: Upload artifact
- name: Upload artifact | aarch64-unknown-linux-gnu
uses: actions/upload-artifact@v4
with:
name: xtask-${{ matrix.host.arch }}
path: target/${{ matrix.host.rust-target }}/release/xtask
name: xtask-aarch64
path: target/aarch64-unknown-linux-gnu/release/xtask

build-tests:
name: Build HIL Tests | ${{ matrix.target.soc }}
Expand Down