From 9b99ae9fd73c23e8bdaa31c0e756a191f2a08463 Mon Sep 17 00:00:00 2001 From: Yu Chen Date: Mon, 9 Aug 2021 13:45:41 +0800 Subject: [PATCH 1/4] update CI --- .github/workflows/deploy.yml | 1 - .github/workflows/main.yml | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index e08ebf9..e2928c0 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -4,7 +4,6 @@ on: push: branches: - master - - dev jobs: deploy: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8caee93..4a0820b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,7 +4,6 @@ on: push: branches: - master - - dev jobs: check: @@ -33,6 +32,8 @@ jobs: cargo clippy cd ch02-03 cargo clippy + cd ../ch03-02 + cargo clippy # uses: actions-rs/cargo@v1 # with: # command: clippy @@ -57,6 +58,8 @@ jobs: cargo build cd ch02-03 cargo build + cd ../ch03-02 + cargo build # uses: actions-rs/cargo@v1 # with: # command: build @@ -81,6 +84,8 @@ jobs: cargo test cd ch02-03 cargo test + cd ../ch03-02 + cargo test doc: runs-on: ${{ matrix.os }} @@ -103,3 +108,5 @@ jobs: cargo doc --no-deps --all-features cd ch02-03 cargo doc --no-deps --all-features + cd ../ch03-02 + cargo doc --no-deps --all-features From 72084350f2f93ab4065b839989494b0aab1438f4 Mon Sep 17 00:00:00 2001 From: Yu Chen Date: Mon, 9 Aug 2021 13:54:08 +0800 Subject: [PATCH 2/4] typo fix --- code/ch03-02/object/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/ch03-02/object/Cargo.toml b/code/ch03-02/object/Cargo.toml index 0d17303..37c36da 100644 --- a/code/ch03-02/object/Cargo.toml +++ b/code/ch03-02/object/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "ch02-03" +name = "ch03-02" version = "0.1.0" authors = ["Runji Wang "] edition = "2018" From 3e629f4fc198d93fba6eef15c627373310796ddc Mon Sep 17 00:00:00 2001 From: Yu Chen Date: Tue, 10 Aug 2021 20:08:44 +0800 Subject: [PATCH 3/4] fix typo --- code/ch03-04/object/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/ch03-04/object/Cargo.toml b/code/ch03-04/object/Cargo.toml index 0d17303..4dd2193 100644 --- a/code/ch03-04/object/Cargo.toml +++ b/code/ch03-04/object/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "ch02-03" +name = "ch03-04" version = "0.1.0" authors = ["Runji Wang "] edition = "2018" @@ -17,4 +17,4 @@ futures = { version = "0.3", default-features = false, features = ["alloc", "asy async-std = { version = "1.9", features = ["attributes", "unstable"] } numeric-enum-macro = "0.2" kernel-hal = { path = "../kernel-hal" } -kernel-hal-unix = { path = "../kernel-hal-unix" } \ No newline at end of file +kernel-hal-unix = { path = "../kernel-hal-unix" } From b7f3d1a128a51c4de21130a1e392d952e9a2a180 Mon Sep 17 00:00:00 2001 From: Yu Chen Date: Tue, 10 Aug 2021 20:10:43 +0800 Subject: [PATCH 4/4] update CI for code/ch03-04 --- .github/workflows/main.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4a0820b..20f7469 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,6 +34,8 @@ jobs: cargo clippy cd ../ch03-02 cargo clippy + cd ../ch03-04 + cargo clippy # uses: actions-rs/cargo@v1 # with: # command: clippy @@ -60,6 +62,8 @@ jobs: cargo build cd ../ch03-02 cargo build + cd ../ch03-04 + cargo build # uses: actions-rs/cargo@v1 # with: # command: build @@ -86,7 +90,8 @@ jobs: cargo test cd ../ch03-02 cargo test - + cd ../ch03-04 + cargo test doc: runs-on: ${{ matrix.os }} strategy: @@ -110,3 +115,5 @@ jobs: cargo doc --no-deps --all-features cd ../ch03-02 cargo doc --no-deps --all-features + cd ../ch03-04 + cargo doc --no-deps --all-features