Skip to content

Commit 50844b6

Browse files
authored
Merge branch 'main' into issue-10014
2 parents 1eb4309 + ec7e81e commit 50844b6

File tree

210 files changed

+2063
-893
lines changed

Some content is hidden

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

210 files changed

+2063
-893
lines changed

.cargo/config.toml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,4 @@ LIBSTDBUF_DIR = "/usr/local/libexec/coreutils"
1515

1616
# remove me
1717
[build]
18-
rustflags = [
19-
"-A",
20-
"clippy::collapsible_if",
21-
"-A",
22-
"clippy::manual_is_multiple_of",
23-
]
18+
rustflags = ["-A", "clippy::collapsible_if"]

.clippy.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ avoid-breaking-exported-api = false
22
check-private-items = true
33
cognitive-complexity-threshold = 24
44
missing-docs-in-crate-items = true
5+
allow-mixed-uninlined-format-args = false

.github/workflows/CICD.yml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name: CICD
55
# spell-checker:ignore (jargon) SHAs deps dequote softprops subshell toolchain fuzzers dedupe devel profdata
66
# spell-checker:ignore (people) Peltoche rivy dtolnay Anson dawidd
77
# spell-checker:ignore (shell/tools) binutils choco clippy dmake esac fakeroot fdesc fdescfs gmake grcov halium lcov libclang libfuse libssl limactl mkdir nextest nocross pacman popd printf pushd redoxer rsync rustc rustfmt rustup shopt sccache utmpdump xargs zstd
8-
# spell-checker:ignore (misc) aarch alnum armhf bindir busytest coreutils defconfig DESTDIR gecos getenforce gnueabihf issuecomment maint manpages msys multisize noconfirm nofeatures nullglob onexitbegin onexitend pell runtest Swatinem tempfile testsuite toybox uutils libsystemd codspeed
8+
# spell-checker:ignore (misc) aarch alnum armhf bindir busytest coreutils defconfig DESTDIR gecos getenforce gnueabihf issuecomment maint manpages msys multisize noconfirm nofeatures nullglob onexitbegin onexitend pell runtest Swatinem tempfile testsuite toybox uutils libsystemd codspeed wasip
99

1010
env:
1111
PROJECT_NAME: coreutils
@@ -322,13 +322,13 @@ jobs:
322322
disable_search: true
323323
flags: makefile,${{ matrix.job.os }}
324324
fail_ci_if_error: false
325-
- name: "`make install PROG_PREFIX=uu- PROFILE=release-fast COMPLETIONS=n MANPAGES=n LOCALES=n`"
325+
- name: "`make install PROG_PREFIX=uu- PROFILE=release-small COMPLETIONS=n MANPAGES=n LOCALES=n`"
326326
shell: bash
327327
run: |
328328
set -x
329-
DESTDIR=/tmp/ make install PROG_PREFIX=uu- PROFILE=release-fast COMPLETIONS=n MANPAGES=n LOCALES=n
329+
DESTDIR=/tmp/ make install PROG_PREFIX=uu- PROFILE=release-small COMPLETIONS=n MANPAGES=n LOCALES=n
330330
# Check that utils are built with given profile
331-
./target/release-fast/true
331+
./target/release-small/true
332332
# Check that the progs have prefix
333333
test -f /tmp/usr/local/bin/uu-tty
334334
test -f /tmp/usr/local/libexec/uu-coreutils/libstdbuf.*
@@ -501,10 +501,10 @@ jobs:
501501
- uses: Swatinem/rust-cache@v2
502502
- name: Run sccache-cache
503503
uses: mozilla-actions/sccache-action@v0.0.9
504-
- name: "`make install PROFILE=release-fast`"
504+
- name: "`make install PROFILE=release`"
505505
shell: bash
506506
run: |
507-
export CARGO_TARGET_DIR=cargo-target RUSTFLAGS="${RUSTFLAGS} -C strip=symbols" PROFILE=release-fast MANPAGES=n COMPLETIONS=n LOCALES=n
507+
export CARGO_TARGET_DIR=cargo-target RUSTFLAGS="${RUSTFLAGS} -C strip=symbols" PROFILE=release MANPAGES=n COMPLETIONS=n LOCALES=n
508508
mkdir -p "${CARGO_TARGET_DIR}" && sudo mount -t tmpfs -o noatime,size=16G tmpfs "${CARGO_TARGET_DIR}"
509509
make install DESTDIR=target/size-release/
510510
make install COMPLETIONS=n MULTICALL=y LN="ln -vf" DESTDIR=target/size-multi-release/
@@ -631,7 +631,7 @@ jobs:
631631
- { os: ubuntu-latest , target: x86_64-unknown-linux-gnu , features: "feat_os_unix,uudoc" , use-cross: no, workspace-tests: true }
632632
- { os: ubuntu-latest , target: x86_64-unknown-linux-musl , features: feat_os_unix_musl , use-cross: use-cross }
633633
- { os: ubuntu-latest , target: x86_64-unknown-redox , features: feat_os_unix_redox , use-cross: redoxer , skip-tests: true }
634-
- { os: ubuntu-latest , target: wasm32-unknown-unknown , default-features: false, features: uucore/format, skip-tests: true, skip-package: true, skip-publish: true }
634+
- { os: ubuntu-latest , target: wasm32-wasip1, default-features: false, features: "basenc,cksum", skip-tests: true }
635635
- { os: macos-latest , target: aarch64-apple-darwin , features: feat_os_macos, workspace-tests: true } # M1 CPU
636636
# PR #7964: Mac should still build even if the feature is not enabled. Do not publish this.
637637
- { os: macos-latest , target: aarch64-apple-darwin , workspace-tests: true, skip-publish: true } # M1 CPU
@@ -672,7 +672,11 @@ jobs:
672672
STAGING='_staging'
673673
outputs STAGING
674674
# determine EXE suffix
675-
EXE_suffix="" ; case '${{ matrix.job.target }}' in *-pc-windows-*) EXE_suffix=".exe" ;; esac;
675+
unset EXE_suffix
676+
case '${{ matrix.job.target }}' in
677+
*-pc-windows-*) EXE_suffix=".exe" ;;
678+
*wasm-*) EXE_suffix=".wasm" ;;
679+
esac;
676680
outputs EXE_suffix
677681
# parse commit reference info
678682
echo GITHUB_REF=${GITHUB_REF}
@@ -868,7 +872,7 @@ jobs:
868872
run: |
869873
## Package artifact(s)
870874
# binaries
871-
cp 'target/${{ matrix.job.target }}/release/${{ env.PROJECT_NAME }}${{ steps.vars.outputs.EXE_suffix }}' '${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_BASENAME }}/'
875+
cp 'target/${{ matrix.job.target }}/release/${{ env.PROJECT_NAME }}'* '${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_BASENAME }}/'
872876
cp 'target/${{ matrix.job.target }}/release/uudoc${{ steps.vars.outputs.EXE_suffix }}' '${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_BASENAME }}/' || :
873877
# README and LICENSE
874878
# * spell-checker:ignore EADME ICENSE

.github/workflows/audit.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Security audit
2+
3+
# spell-checker:ignore (misc) rustsec
4+
5+
on:
6+
schedule:
7+
- cron: "0 0 * * *"
8+
jobs:
9+
audit:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v6
13+
- uses: rustsec/audit-check@v2
14+
with:
15+
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- name: Get current version from Cargo.toml
4343
id: version
4444
run: |
45-
VERSION=$(awk '/\[workspace\.package\]/{flag=1; next} flag && /version = /{gsub(/.*= "/, ""); gsub(/".*/, ""); print; exit}' Cargo.toml)
45+
VERSION=$(awk '/\[workspace\.package\]/{flag=1; next} flag && /^version = /{gsub(/.*= "/, ""); gsub(/".*/, ""); print; exit}' Cargo.toml)
4646
echo "version=$VERSION" >> $GITHUB_OUTPUT
4747
echo "Detected version: $VERSION"
4848

Cargo.lock

Lines changed: 20 additions & 97 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)