Skip to content

Commit a1a702f

Browse files
authored
Merge branch 'main' into pwd-help-gnu-compat
2 parents 88d47ac + 2d718f2 commit a1a702f

File tree

408 files changed

+22624
-7289
lines changed

Some content is hidden

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

408 files changed

+22624
-7289
lines changed

.busybox-config

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,8 @@ CONFIG_FEATURE_FANCY_HEAD=y
22
CONFIG_UNICODE_SUPPORT=y
33
CONFIG_DESKTOP=y
44
CONFIG_LONG_OPTS=y
5+
CONFIG_FEATURE_SORT_BIG=y
6+
CONFIG_FEATURE_CATV=y
7+
CONFIG_FEATURE_CATN=y
8+
CONFIG_FEATURE_TR_CLASSES=y
9+
CONFIG_FEATURE_READLINK_FOLLOW=y

.cargo/config.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
[target.x86_64-unknown-redox]
66
linker = "x86_64-unknown-redox-gcc"
7+
[target.aarch64-unknown-linux-gnu]
8+
linker = "aarch64-linux-gnu-gcc"
79

810
[env]
911
# See feat_external_libstdbuf in src/uu/stdbuf/Cargo.toml

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ RUN apt-get update \
1212
gcc \
1313
gdb \
1414
gperf \
15-
jq \
1615
libacl1-dev \
1716
libattr1-dev \
1817
libcap-dev \
1918
libexpect-perl \
2019
libselinux1-dev \
20+
libsystemd-dev \
2121
python3-pyinotify \
2222
quilt \
2323
texinfo \

.github/workflows/CICD.yml

Lines changed: 71 additions & 116 deletions
Large diffs are not rendered by default.

.github/workflows/CheckScripts.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
permissions:
3030
contents: read
3131
steps:
32-
- uses: actions/checkout@v5
32+
- uses: actions/checkout@v6
3333
with:
3434
persist-credentials: false
3535
- name: Run ShellCheck
@@ -47,7 +47,7 @@ jobs:
4747
permissions:
4848
contents: read
4949
steps:
50-
- uses: actions/checkout@v5
50+
- uses: actions/checkout@v6
5151
with:
5252
persist-credentials: false
5353
- name: Setup shfmt

.github/workflows/FixPR.yml

Lines changed: 1 addition & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
job:
2727
- { os: ubuntu-latest , features: feat_os_unix }
2828
steps:
29-
- uses: actions/checkout@v5
29+
- uses: actions/checkout@v6
3030
with:
3131
persist-credentials: false
3232
- name: Initialize job variables
@@ -77,49 +77,3 @@ jobs:
7777
add: Cargo.lock fuzz/Cargo.lock
7878
env:
7979
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
80-
81-
code_format:
82-
# Recheck/refresh code formatting
83-
if: github.event.pull_request.merged == true ## only for PR merges
84-
name: Update/format
85-
runs-on: ${{ matrix.job.os }}
86-
strategy:
87-
fail-fast: false
88-
matrix:
89-
job:
90-
- { os: ubuntu-latest , features: feat_os_unix }
91-
steps:
92-
- uses: actions/checkout@v5
93-
with:
94-
persist-credentials: false
95-
- name: Initialize job variables
96-
id: vars
97-
shell: bash
98-
run: |
99-
# target-specific options
100-
# * CARGO_FEATURES_OPTION
101-
CARGO_FEATURES_OPTION='' ;
102-
if [ -n "${{ matrix.job.features }}" ]; then CARGO_FEATURES_OPTION='--features "${{ matrix.job.features }}"' ; fi
103-
echo "CARGO_FEATURES_OPTION=${CARGO_FEATURES_OPTION}" >> $GITHUB_OUTPUT
104-
- uses: dtolnay/rust-toolchain@master
105-
with:
106-
toolchain: stable
107-
components: rustfmt
108-
- uses: Swatinem/rust-cache@v2
109-
- name: "`cargo fmt`"
110-
shell: bash
111-
run: |
112-
cargo fmt
113-
- name: "`cargo fmt` tests"
114-
shell: bash
115-
run: |
116-
# `cargo fmt` of tests
117-
find tests -name "*.rs" -print0 | xargs -0 cargo fmt --
118-
- name: Commit any changes (to '${{ env.BRANCH_TARGET }}')
119-
uses: EndBug/add-and-commit@v9
120-
with:
121-
new_branch: ${{ env.BRANCH_TARGET }}
122-
default_author: github_actions
123-
message: "maint ~ rustfmt (`cargo fmt`)"
124-
env:
125-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)