Skip to content

Commit

Permalink
Auto merge of #12000 - weihanglo:exclude-cleanup, r=epage
Browse files Browse the repository at this point in the history
Remove `src/doc` from `exclude` list in Cargo.toml
  • Loading branch information
bors committed Apr 21, 2023
2 parents c3e3d90 + 8966ab0 commit 3f3c852
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 11 deletions.
13 changes: 7 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,8 @@ jobs:
- run: rustup component add rust-docs
- run: ci/validate-man.sh
# This requires rustfmt, use stable.
- run: cd src/doc/semver-check && cargo +stable run
- name: Run semver-check
run: cargo +stable run -p semver-check
- run: |
mkdir mdbook
curl -Lf https://github.com/rust-lang/mdBook/releases/download/v0.4.27/mdbook-v0.4.27-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=./mdbook
Expand All @@ -195,11 +196,11 @@ jobs:
env:
RUSTDOCFLAGS: -D warnings
- run: cd src/doc && mdbook build --dest-dir ../../target/doc
- run: |
cd src/doc
curl -sSLo linkcheck.sh \
https://raw.githubusercontent.com/rust-lang/rust/master/src/tools/linkchecker/linkcheck.sh
sh linkcheck.sh --all cargo
- name: Run linkchecker.sh
run: |
cd target
curl -sSLO https://raw.githubusercontent.com/rust-lang/rust/master/src/tools/linkchecker/linkcheck.sh
sh linkcheck.sh --all --path ../src/doc cargo
success:
permissions:
Expand Down
7 changes: 7 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ members = [
"benches/capture",
]
exclude = [
# For linkchecker (downloaded during CI) and semver-check
# TODO: Either move semver-check to crates/ folder,
# or make linkchecker run from a given directory.
"src/doc/",
"target/", # exclude bench testing
]

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const SEPARATOR: &str = "///////////////////////////////////////////////////////
fn doit() -> Result<(), Box<dyn Error>> {
let filename = std::env::args()
.nth(1)
.unwrap_or_else(|| "../src/reference/semver.md".to_string());
.unwrap_or_else(|| "src/doc/src/reference/semver.md".to_string());
let contents = fs::read_to_string(filename)?;
let mut lines = contents.lines().enumerate();

Expand Down

0 comments on commit 3f3c852

Please sign in to comment.