Skip to content

Commit 41950da

Browse files
authored
Merge branch 'uutils:main' into base64_performance
2 parents 3079380 + ee39b35 commit 41950da

File tree

119 files changed

+5427
-2809
lines changed

Some content is hidden

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

119 files changed

+5427
-2809
lines changed

.devcontainer/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ RUN apt-get update \
1212
gcc \
1313
gdb \
1414
gperf \
15-
jq \
1615
libacl1-dev \
1716
libattr1-dev \
1817
libcap-dev \

.github/workflows/CICD.yml

Lines changed: 35 additions & 83 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 & 1 deletion
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

.github/workflows/GnuTests.yml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
steps:
3838
#### Get the code, setup cache
3939
- name: Checkout code (uutils)
40-
uses: actions/checkout@v5
40+
uses: actions/checkout@v6
4141
with:
4242
path: 'uutils'
4343
persist-credentials: false
@@ -59,7 +59,7 @@ jobs:
5959
with:
6060
workspaces: "./uutils -> target"
6161
- name: Checkout code (GNU coreutils)
62-
uses: actions/checkout@v5
62+
uses: actions/checkout@v6
6363
with:
6464
repository: 'coreutils/coreutils'
6565
path: 'gnu'
@@ -80,7 +80,8 @@ jobs:
8080
run: |
8181
## Install dependencies
8282
sudo apt-get update
83-
sudo apt-get install -y autoconf autopoint bison texinfo gperf gcc g++ gdb python3-pyinotify jq valgrind libexpect-perl libacl1-dev libattr1-dev libcap-dev libselinux1-dev attr quilt
83+
## Check that build-gnu.sh works on the non SELinux system by installing libselinux only on lima
84+
sudo apt-get install -y autopoint gperf gdb python3-pyinotify valgrind libexpect-perl libacl1-dev libattr1-dev libcap-dev attr quilt
8485
- name: Add various locales
8586
shell: bash
8687
run: |
@@ -98,6 +99,9 @@ jobs:
9899
sudo locale-gen --keep-existing en_US
99100
sudo locale-gen --keep-existing en_US.UTF-8
100101
sudo locale-gen --keep-existing ru_RU.KOI8-R
102+
sudo locale-gen --keep-existing fa_IR.UTF-8 # Iran
103+
sudo locale-gen --keep-existing am_ET.UTF-8 # Ethiopia
104+
sudo locale-gen --keep-existing th_TH.UTF-8 # Thailand
101105
102106
sudo update-locale
103107
echo "After:"
@@ -109,7 +113,7 @@ jobs:
109113
run: |
110114
## Build binaries
111115
cd 'uutils'
112-
bash util/build-gnu.sh --release-build
116+
env PROFILE=release-small bash util/build-gnu.sh
113117
114118
### Run tests as user
115119
- name: Run GNU tests
@@ -169,7 +173,7 @@ jobs:
169173
steps:
170174
#### Get the code, setup cache
171175
- name: Checkout code (uutils)
172-
uses: actions/checkout@v5
176+
uses: actions/checkout@v6
173177
with:
174178
path: 'uutils'
175179
persist-credentials: false
@@ -191,7 +195,7 @@ jobs:
191195
with:
192196
workspaces: "./uutils -> target"
193197
- name: Checkout code (GNU coreutils)
194-
uses: actions/checkout@v5
198+
uses: actions/checkout@v6
195199
with:
196200
repository: 'coreutils/coreutils'
197201
path: 'gnu'
@@ -235,7 +239,7 @@ jobs:
235239
- name: Install dependencies in VM
236240
run: |
237241
lima sudo dnf -y update
238-
lima sudo dnf -y install git autoconf autopoint bison texinfo gperf gcc g++ gdb jq libacl-devel libattr-devel libcap-devel libselinux-devel attr rustup clang-devel texinfo-tex wget automake patch quilt
242+
lima sudo dnf -y install git autoconf autopoint bison texinfo gperf gcc gdb jq libacl-devel libattr-devel libcap-devel libselinux-devel attr rustup clang-devel texinfo-tex automake patch quilt
239243
lima rustup-init -y --default-toolchain stable
240244
- name: Copy the sources to VM
241245
run: |
@@ -244,7 +248,7 @@ jobs:
244248
### Build
245249
- name: Build binaries
246250
run: |
247-
lima bash -c "cd ~/work/uutils/ && bash util/build-gnu.sh --release-build"
251+
lima bash -c "cd ~/work/uutils/ && SELINUX_ENABLED=1 PROFILE=release-small bash util/build-gnu.sh"
248252
249253
### Run tests as user
250254
- name: Generate SELinux tests list
@@ -328,7 +332,7 @@ jobs:
328332
329333
outputs TEST_SUMMARY_FILE AGGREGATED_SUMMARY_FILE
330334
- name: Checkout code (uutils)
331-
uses: actions/checkout@v5
335+
uses: actions/checkout@v6
332336
with:
333337
path: 'uutils'
334338
persist-credentials: false

.github/workflows/android.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ concurrency:
2222
env:
2323
TERMUX: v0.118.0
2424
KEY_POSTFIX: nextest+rustc-hash+adb+sshd+upgrade+XGB+inc18
25-
COMMON_EMULATOR_OPTIONS: -no-window -noaudio -no-boot-anim -camera-back none -gpu swiftshader_indirect -metrics-collection
25+
COMMON_EMULATOR_OPTIONS: -no-window -noaudio -no-boot-anim -camera-back none -gpu off
2626
EMULATOR_DISK_SIZE: 12GB
2727
EMULATOR_HEAP_SIZE: 2048M
2828
EMULATOR_BOOT_TIMEOUT: 1200 # 20min
@@ -36,15 +36,10 @@ jobs:
3636
matrix:
3737
os: [ubuntu-latest] # , macos-latest
3838
cores: [4] # , 6
39-
ram: [4096, 8192]
39+
ram: [4096]
4040
api-level: [28]
4141
target: [google_apis_playstore]
4242
arch: [x86, x86_64] # , arm64-v8a
43-
exclude:
44-
- ram: 8192
45-
arch: x86
46-
- ram: 4096
47-
arch: x86_64
4843
runs-on: ${{ matrix.os }}
4944
env:
5045
EMULATOR_RAM_SIZE: ${{ matrix.ram }}
@@ -80,7 +75,7 @@ jobs:
8075
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
8176
sudo udevadm control --reload-rules
8277
sudo udevadm trigger --name-match=kvm
83-
- uses: actions/checkout@v5
78+
- uses: actions/checkout@v6
8479
with:
8580
persist-credentials: false
8681
- name: Collect information about runner

.github/workflows/benchmarks.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
- { package: uu_numfmt }
3838
- { package: uu_rm }
3939
- { package: uu_seq }
40+
- { package: uu_shuf }
4041
- { package: uu_sort }
4142
- { package: uu_split }
4243
- { package: uu_tsort }
@@ -45,7 +46,7 @@ jobs:
4546
- { package: uu_wc }
4647
- { package: uu_factor }
4748
steps:
48-
- uses: actions/checkout@v5
49+
- uses: actions/checkout@v6
4950
with:
5051
persist-credentials: false
5152

.github/workflows/code-quality.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
job:
3333
- { os: ubuntu-latest , features: feat_os_unix }
3434
steps:
35-
- uses: actions/checkout@v5
35+
- uses: actions/checkout@v6
3636
with:
3737
persist-credentials: false
3838
- uses: dtolnay/rust-toolchain@master
@@ -82,7 +82,7 @@ jobs:
8282
- { os: macos-latest , features: feat_os_macos }
8383
- { os: windows-latest , features: feat_os_windows }
8484
steps:
85-
- uses: actions/checkout@v5
85+
- uses: actions/checkout@v6
8686
with:
8787
persist-credentials: false
8888
- uses: dtolnay/rust-toolchain@master
@@ -156,7 +156,7 @@ jobs:
156156
job:
157157
- { os: ubuntu-latest , features: feat_os_unix }
158158
steps:
159-
- uses: actions/checkout@v5
159+
- uses: actions/checkout@v6
160160
with:
161161
persist-credentials: false
162162
- name: Initialize workflow variables
@@ -174,7 +174,7 @@ jobs:
174174
- name: Install/setup prerequisites
175175
shell: bash
176176
run: |
177-
sudo apt-get -y update ; sudo apt-get -y install npm ; sudo npm install cspell -g ;
177+
sudo npm install cspell -g ;
178178
- name: Run `cspell`
179179
shell: bash
180180
run: |
@@ -194,7 +194,7 @@ jobs:
194194
runs-on: ubuntu-latest
195195
steps:
196196
- name: Clone repository
197-
uses: actions/checkout@v5
197+
uses: actions/checkout@v6
198198
with:
199199
persist-credentials: false
200200

@@ -206,7 +206,7 @@ jobs:
206206
runs-on: ubuntu-latest
207207
steps:
208208
- name: Clone repository
209-
uses: actions/checkout@v5
209+
uses: actions/checkout@v6
210210
with:
211211
persist-credentials: false
212212

@@ -230,7 +230,7 @@ jobs:
230230
runs-on: ubuntu-latest
231231
steps:
232232
- name: Checkout repository
233-
uses: actions/checkout@v5
233+
uses: actions/checkout@v6
234234
with:
235235
persist-credentials: false
236236

.github/workflows/devcontainer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
runs-on: ubuntu-latest
2323
timeout-minutes: 45
2424
steps:
25-
- uses: actions/checkout@v5
25+
- uses: actions/checkout@v6
2626
with:
2727
persist-credentials: false
2828
- name: Run test in devcontainer

.github/workflows/documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
steps:
2626
- name: Checkout repository
27-
uses: actions/checkout@v5
27+
uses: actions/checkout@v6
2828

2929
- name: Install/setup prerequisites
3030
shell: bash

0 commit comments

Comments
 (0)