Skip to content

Commit a725078

Browse files
authored
Merge pull request #1818 from JohnTitor/test
2 parents 0bf7ce3 + fbac7b6 commit a725078

File tree

4 files changed

+473
-8
lines changed

4 files changed

+473
-8
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ platforms in which `libc` tests are run.
7070
This project is licensed under either of
7171

7272
* [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0)
73-
([LICENSE-APACHE](LICENSE-APACHE))
73+
([LICENSE-APACHE](https://github.com/rust-lang/libc/blob/master/LICENSE-APACHE))
7474

7575
* [MIT License](https://opensource.org/licenses/MIT)
76-
([LICENSE-MIT](LICENSE-MIT))
76+
([LICENSE-MIT](https://github.com/rust-lang/libc/blob/master/LICENSE-MIT))
7777

7878
at your option.
7979

@@ -82,7 +82,7 @@ at your option.
8282
We welcome all people who want to contribute. Please see the [contributing
8383
instructions] for more information.
8484

85-
[contributing instructions]: CONTRIBUTING.md
85+
[contributing instructions]: https://github.com/rust-lang/libc/blob/master/CONTRIBUTING.md
8686

8787
Contributions in any form (issues, pull requests, etc.) to this project
8888
must adhere to Rust's [Code of Conduct].

ci/azure-install-rust.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,18 @@ steps:
7272
where gcc
7373
condition: eq( variables['Agent.OS'], 'Windows_NT' )
7474
displayName: Query gcc path
75+
# This often fails fetching. Let's try several times.
7576
- bash: |
7677
set -ex
7778
cargo generate-lockfile
78-
cargo generate-lockfile --manifest-path libc-test/Cargo.toml
79+
N=5
80+
n=0
81+
until [ $n -ge $N ]
82+
do
83+
if cargo generate-lockfile ; then
84+
break
85+
fi
86+
n=$((n+1))
87+
sleep 1
88+
done
7989
displayName: Generate lockfiles
80-

ci/dox.sh

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,16 @@ done < targets
6666
cp $README $TARGET_DOC_DIR
6767
line=$(grep -n '<div class="platform_docs"></div>' $README | cut -d ":" -f 1)
6868

69-
set +x
7069
{ head -n "$((line-1))" $README; cat $PLATFORM_SUPPORT; tail -n "+$((line+1))" $README; } > $TARGET_DOC_DIR/$README
71-
set -x
7270

73-
RUSTDOCFLAGS="--enable-index-page --index-page=${TARGET_DOC_DIR}/${README} -Zunstable-options" cargo doc
71+
cp $TARGET_DOC_DIR/$README $TARGET_DOC_DIR/index.md
72+
73+
RUSTDOCFLAGS="--enable-index-page --index-page=${TARGET_DOC_DIR}/index.md -Zunstable-options" cargo doc
74+
75+
# Tweak style
76+
cp ci/rust.css $TARGET_DOC_DIR
77+
sed -ie "8i <link rel=\"stylesheet\" type=\"text/css\" href=\"normalize.css\">" $TARGET_DOC_DIR/index.html
78+
sed -ie "9i <link rel=\"stylesheet\" type=\"text/css\" href=\"rust.css\">" $TARGET_DOC_DIR/index.html
7479

7580
# Copy the licenses
7681
cp LICENSE-* $TARGET_DOC_DIR/

0 commit comments

Comments
 (0)