Skip to content

Commit aaf2473

Browse files
oech3oech3
authored andcommitted
Merge branch 'main' into patch-3
2 parents 4b0ef7a + 3108c45 commit aaf2473

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

.github/workflows/documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
uses: dtolnay/rust-toolchain@stable
3535

3636
- name: Download tldr
37-
run: curl https://tldr.sh/assets/tldr.zip -o docs/tldr.zip
37+
run: curl -L https://github.com/tldr-pages/tldr/releases/latest/download/tldr.zip -o docs/tldr.zip
3838

3939
- name: Generate documentation
4040
run: cargo run --bin uudoc --all-features

src/bin/uudoc.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,9 @@ fn print_tldr_error() {
140140
"To include examples in the documentation, download the tldr archive and put it in the docs/ folder."
141141
);
142142
eprintln!();
143-
eprintln!(" curl https://tldr.sh/assets/tldr.zip -o docs/tldr.zip");
143+
eprintln!(
144+
" curl -L https://github.com/tldr-pages/tldr/releases/latest/download/tldr.zip -o docs/tldr.zip"
145+
);
144146
eprintln!();
145147
}
146148

util/build-gnu.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ cd -
9797
"${MAKE}" UTILS=install PROFILE="${PROFILE}" CARGOFLAGS="${CARGO_FEATURE_FLAGS}"
9898
ln -vf "${UU_BUILD_DIR}/install" "${UU_BUILD_DIR}/ginstall" # The GNU tests use renamed install to ginstall
9999
if [ "${SELINUX_ENABLED}" = 1 ];then
100-
# Building few utils for SELinux tests should save 4 min. But difficult to list the. Also MULTICALL=y fails even it is faster to build...
101-
# "${MAKE}" UTILS="basename cat chcon cp du echo env id ln ls mkdir mkfifo mknod mktemp mv printf rm rmdir runcon stat test touch tr uname whoami" PROFILE="${PROFILE}" CARGOFLAGS="${CARGO_FEATURE_FLAGS}"
102-
"${MAKE}" SKIP_UTILS="factor hashsum shuf shred install more" PROFILE="${PROFILE}" CARGOFLAGS="${CARGO_FEATURE_FLAGS}"
100+
# Build few utils for SELinux tests to save 4 min+. MULTICALL=y fails even it is faster to build...
101+
"${MAKE}" UTILS="cat chcon cp cut echo env groups id ln ls mkdir mkfifo mknod mktemp mv printf rm rmdir runcon stat test touch tr uname wc whoami" PROFILE="${PROFILE}" CARGOFLAGS="${CARGO_FEATURE_FLAGS}"
102+
#"${MAKE}" SKIP_UTILS="arch base32 base64 basename basenc chgrp chmod chown chroot cksum comm csplit date dd df dir dircolors dirname du expr factor hashsum head hostid hostname install join kill link logname more nice nl nohup nproc numfmt od paste pathchk pinky pr printenv ptx pwd readlink realpath seq shuf shred sleep sort split stdbuf stty sum sync tac tail tee timeout true truncate tsort tty unexpand uniq uptime unlink users vdir who yes" PROFILE="${PROFILE}" CARGOFLAGS="${CARGO_FEATURE_FLAGS}"
103103
# min test for SELinux
104104
touch g && "${PROFILE}"/stat -c%C g && rm g
105105
else

0 commit comments

Comments
 (0)