Skip to content

Commit

Permalink
separation of CI
Browse files Browse the repository at this point in the history
  • Loading branch information
romancardenas committed Nov 17, 2023
1 parent 612d58d commit b2a3be5
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 13 deletions.
53 changes: 53 additions & 0 deletions .github/workflows/build_riscv-rt.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
on:
push:
branches: [ master, add-riscv-rt ]
pull_request:
merge_group:

name: Build check

jobs:
build-riscv:
strategy:
matrix:
# All generated code should be running on stable now, MRSV is 1.59.0
toolchain: [ stable, nightly, 1.59.0 ]
target:
- riscv32i-unknown-none-elf
- riscv32imc-unknown-none-elf
- riscv32imac-unknown-none-elf
- riscv64imac-unknown-none-elf
- riscv64gc-unknown-none-elf
example:
- empty
- multi_core
cargo_flags:
- "--no-default-features"
- "features=s-mode"
- "features=single-hart"
- "--all-features"
include:
# Nightly is only for reference and allowed to fail
- toolchain: nightly
experimental: true
runs-on: ubuntu-latest
continue-on-error: ${{ matrix.experimental || false }}
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ matrix.toolchain }}
targets: ${{ matrix.target }}
- name: Build library
run: cargo build --target ${{ matrix.target }} ${{ matrix.cargo_flags }}
- name: Build example
run: RUSTFLAGS="-C link-arg=-Texamples/device.x" cargo build --target ${{ matrix.target }} --example ${{ matrix.example }} ${{ matrix.cargo_flags }}

# Job to check that all the builds succeeded
build-check:
needs:
- build-riscv
runs-on: ubuntu-latest
if: always()
steps:
- run: jq --exit-status 'all(.result == "success")' <<< '${{ toJson(needs) }}'
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request:
merge_group:

name: Build check
name: Build check (riscv)

jobs:
# We check that the crate builds and links for all the toolchains and targets.
Expand All @@ -13,9 +13,6 @@ jobs:
matrix:
# All generated code should be running on stable now, MRSV is 1.59.0
toolchain: [ stable, nightly, 1.60.0 ]
package:
- riscv
- riscv-rt
target:
- riscv32i-unknown-none-elf
- riscv32imc-unknown-none-elf
Expand All @@ -27,10 +24,6 @@ jobs:
# Nightly is only for reference and allowed to fail
- toolchain: nightly
experimental: true
- package: riscv-rt
cargo_flags:
- "--features=s-mode"
- "--features=single-hart"
runs-on: ubuntu-latest
continue-on-error: ${{ matrix.experimental || false }}
steps:
Expand All @@ -39,8 +32,8 @@ jobs:
with:
toolchain: ${{ matrix.toolchain }}
targets: ${{ matrix.target }}
- name: Build library
run: cargo build --package ${{ matrix.package }} --target ${{ matrix.target }} ${{ matrix.cargo_flags }}
- name: Build
run: cargo build --package riscv --target ${{ matrix.target }} ${{ matrix.cargo_flags }}

# On MacOS, Ubuntu, and Windows, we at least make sure that the crate builds and links.
build-others:
Expand All @@ -50,15 +43,13 @@ jobs:
- macos-latest
- ubuntu-latest
- windows-latest
package:
- riscv
cargo_flags: [ "--no-default-features", "--all-features" ]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@stable
- name: Build crate for host OS
run: cargo build --package ${{ matrix.package }} ${{ matrix.cargo_flags }}
run: cargo build --package riscv ${{ matrix.cargo_flags }}

# Job to check that all the builds succeeded
build-check:
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/clippy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,18 @@ jobs:
strategy:
matrix:
toolchain: [ stable, nightly ]
package: [ riscv, riscv-rt ]
cargo_flags:
- "--no-default-features"
- "--all-features"
include:
# Nightly is only for reference and allowed to fail
- toolchain: nightly
experimental: true
- package: riscv-rt
cargo_flags:
- "--features=s-mode"
- "--features=single-hart"
runs-on: ubuntu-latest
continue-on-error: ${{ matrix.experimental || false }}
steps:
Expand Down

0 comments on commit b2a3be5

Please sign in to comment.