Skip to content

Commit b79ffa9

Browse files
authored
Merge pull request #2115 from ehuss/workspace
Move tools into a consolidated cargo workspace
2 parents de04442 + e77f436 commit b79ffa9

Some content is hidden

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

45 files changed

+1276
-1305
lines changed

.cargo/config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[alias]
2-
xtask = "run --manifest-path=xtask/Cargo.toml --"
2+
xtask = "run --package xtask --"

.github/workflows/main.yml

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,8 @@ jobs:
5858
rustc -Vv
5959
mdbook --version
6060
- name: Style checks
61-
working-directory: style-check
62-
run: cargo run --locked -- ../src
63-
- name: Style fmt
64-
working-directory: style-check
61+
run: cargo xtask style-check
62+
- name: Rustfmt check
6563
run: cargo fmt --check
6664
- name: Verify the book builds
6765
env:
@@ -94,18 +92,10 @@ jobs:
9492
run: |
9593
rustup --version
9694
rustc -Vv
97-
- name: Verify mdbook-spec lockfile is current
98-
working-directory: ./mdbook-spec
95+
- name: Verify tools workspace lockfile is current
9996
run: cargo update -p mdbook-spec --locked
100-
- name: Test mdbook-spec
101-
working-directory: ./mdbook-spec
97+
- name: Test tools
10298
run: cargo test
103-
- name: Rustfmt check
104-
working-directory: ./mdbook-spec
105-
run: cargo fmt --check
106-
- name: Xtask rustfmt check
107-
working-directory: ./xtask
108-
run: cargo fmt --check
10999

110100
preview:
111101
if: github.event_name == 'pull_request'

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
book
2-
stable-check/
1+
/book
2+
/target

0 commit comments

Comments
 (0)