Skip to content

Commit

Permalink
Merge pull request #232 from rust-osdev/next
Browse files Browse the repository at this point in the history
`v0.11`: Redesign config and build system, split into sub-crates, and provide disk image builder
  • Loading branch information
phil-opp authored Nov 13, 2022
2 parents 77c9525 + 2ca6ebd commit b4d58a8
Show file tree
Hide file tree
Showing 153 changed files with 6,083 additions and 4,310 deletions.
7 changes: 2 additions & 5 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
[target.x86_64-unknown-uefi]
runner = "cargo run -p runner"

[alias]
builder = "run --bin builder --features builder --quiet --"
[unstable]
bindeps = true
36 changes: 7 additions & 29 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
pull_request:
schedule:
- cron: '40 5 * * *' # every day at 5:40
- cron: "40 5 * * *" # every day at 5:40

jobs:
check:
Expand All @@ -15,10 +15,6 @@ jobs:

steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
profile: minimal
override: true
- name: "Run `cargo check`"
uses: actions-rs/cargo@v1
with:
Expand All @@ -36,11 +32,6 @@ jobs:

steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
profile: minimal
override: true
components: rust-src, llvm-tools-preview

# install QEMU
- name: Install QEMU (Linux)
Expand All @@ -62,30 +53,22 @@ jobs:
- name: "Print QEMU Version"
run: qemu-system-x86_64 --version

- name: Run `cargo test`
- name: Run api tests
uses: actions-rs/cargo@v1
with:
command: test
args: "-- --test-threads 1"
args: -p bootloader_api

- name: "Example: `basic`"
working-directory: examples/basic
run: cargo kimage

- name: "Example: `test_framework` example"
working-directory: examples/test_framework
run: cargo ktest
- name: Run integration tests
uses: actions-rs/cargo@v1
with:
command: test

fmt:
name: Check Formatting
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
profile: minimal
override: true
components: rustfmt
- name: Run `cargo fmt --all -- --check`
uses: actions-rs/cargo@v1
with:
Expand All @@ -97,11 +80,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
profile: minimal
override: true
components: clippy
- name: Run `cargo clippy`
uses: actions-rs/cargo@v1
with:
Expand Down
6 changes: 0 additions & 6 deletions .vscode/settings.json

This file was deleted.

Loading

0 comments on commit b4d58a8

Please sign in to comment.