Skip to content

Commit b4d58a8

Browse files
authored
Merge pull request #232 from rust-osdev/next
`v0.11`: Redesign config and build system, split into sub-crates, and provide disk image builder
2 parents 77c9525 + 2ca6ebd commit b4d58a8

File tree

153 files changed

+6083
-4310
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+6083
-4310
lines changed

Diff for: .cargo/config.toml

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
1-
[target.x86_64-unknown-uefi]
2-
runner = "cargo run -p runner"
3-
4-
[alias]
5-
builder = "run --bin builder --features builder --quiet --"
1+
[unstable]
2+
bindeps = true

Diff for: .github/workflows/ci.yml

+7-29
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
pull_request:
66
schedule:
7-
- cron: '40 5 * * *' # every day at 5:40
7+
- cron: "40 5 * * *" # every day at 5:40
88

99
jobs:
1010
check:
@@ -15,10 +15,6 @@ jobs:
1515

1616
steps:
1717
- uses: actions/checkout@v2
18-
- uses: actions-rs/toolchain@v1
19-
with:
20-
profile: minimal
21-
override: true
2218
- name: "Run `cargo check`"
2319
uses: actions-rs/cargo@v1
2420
with:
@@ -36,11 +32,6 @@ jobs:
3632

3733
steps:
3834
- uses: actions/checkout@v2
39-
- uses: actions-rs/toolchain@v1
40-
with:
41-
profile: minimal
42-
override: true
43-
components: rust-src, llvm-tools-preview
4435

4536
# install QEMU
4637
- name: Install QEMU (Linux)
@@ -62,30 +53,22 @@ jobs:
6253
- name: "Print QEMU Version"
6354
run: qemu-system-x86_64 --version
6455

65-
- name: Run `cargo test`
56+
- name: Run api tests
6657
uses: actions-rs/cargo@v1
6758
with:
6859
command: test
69-
args: "-- --test-threads 1"
60+
args: -p bootloader_api
7061

71-
- name: "Example: `basic`"
72-
working-directory: examples/basic
73-
run: cargo kimage
74-
75-
- name: "Example: `test_framework` example"
76-
working-directory: examples/test_framework
77-
run: cargo ktest
62+
- name: Run integration tests
63+
uses: actions-rs/cargo@v1
64+
with:
65+
command: test
7866

7967
fmt:
8068
name: Check Formatting
8169
runs-on: ubuntu-latest
8270
steps:
8371
- uses: actions/checkout@v2
84-
- uses: actions-rs/toolchain@v1
85-
with:
86-
profile: minimal
87-
override: true
88-
components: rustfmt
8972
- name: Run `cargo fmt --all -- --check`
9073
uses: actions-rs/cargo@v1
9174
with:
@@ -97,11 +80,6 @@ jobs:
9780
runs-on: ubuntu-latest
9881
steps:
9982
- uses: actions/checkout@v2
100-
- uses: actions-rs/toolchain@v1
101-
with:
102-
profile: minimal
103-
override: true
104-
components: clippy
10583
- name: Run `cargo clippy`
10684
uses: actions-rs/cargo@v1
10785
with:

Diff for: .vscode/settings.json

-6
This file was deleted.

0 commit comments

Comments
 (0)