Skip to content

Commit 0f53666

Browse files
mattsu2020mattsu2020
authored
Merge branch 'main' into factor_fix
2 parents 17f6fe0 + 2c75e71 commit 0f53666

Some content is hidden

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

66 files changed

+2346
-959
lines changed

‎.github/workflows/CICD.yml‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ jobs:
298298
fi
299299
# Check that we don't cross-build uudoc
300300
# also do not try to generate manpages for part of hashsum
301-
make install-manpages PREFIX=/tmp/usr UTILS=true RUSTC_ARCH="--target aarch64-unknown-linux-gnu"
301+
env CARGO_BUILD_TARGET=aarch64-unknown-linux-gnu make install-manpages PREFIX=/tmp/usr UTILS=true
302302
# build (host)
303303
make build
304304
echo "Check that target directory will be ignored by backup tools"
@@ -878,10 +878,14 @@ jobs:
878878
shell: bash
879879
run: |
880880
## Package artifact(s)
881-
# binary
881+
# binaries
882882
cp 'target/${{ matrix.job.target }}/release/${{ env.PROJECT_NAME }}${{ steps.vars.outputs.EXE_suffix }}' '${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_BASENAME }}/'
883+
cp 'target/${{ matrix.job.target }}/release/uudoc${{ steps.vars.outputs.EXE_suffix }}' '${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_BASENAME }}/' || :
883884
# `strip` binary (if needed)
884-
if [ -n "${{ steps.vars.outputs.STRIP }}" ]; then "${{ steps.vars.outputs.STRIP }}" '${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_BASENAME }}/${{ env.PROJECT_NAME }}${{ steps.vars.outputs.EXE_suffix }}' ; fi
885+
if [ -n "${{ steps.vars.outputs.STRIP }}" ]; then
886+
"${{ steps.vars.outputs.STRIP }}" '${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_BASENAME }}/${{ env.PROJECT_NAME }}${{ steps.vars.outputs.EXE_suffix }}'
887+
"${{ steps.vars.outputs.STRIP }}" '${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_BASENAME }}/uudoc' || :
888+
fi
885889
# README and LICENSE
886890
# * spell-checker:ignore EADME ICENSE
887891
(shopt -s nullglob; for f in [R]"EADME"{,.*}; do cp $f '${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_BASENAME }}/' ; done)
@@ -902,6 +906,18 @@ jobs:
902906
${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_NAME }}
903907
env:
904908
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
909+
- name: Publish latest commit
910+
uses: softprops/action-gh-release@v2
911+
if: steps.vars.outputs.DEPLOY && matrix.job.skip-publish != true
912+
with:
913+
tag_name: latest-commit
914+
force_update: true
915+
draft: false
916+
prerelease: true
917+
files: |
918+
${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_NAME }}
919+
env:
920+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
905921

906922
test_busybox:
907923
name: Tests/BusyBox test suite

‎.github/workflows/benchmarks.yml‎

Lines changed: 40 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -18,36 +18,38 @@ concurrency:
1818

1919
jobs:
2020
benchmarks:
21-
name: Run benchmarks (CodSpeed)
21+
name: Run ${{ matrix.type }} benchmarks for ${{ matrix.package }} (CodSpeed)
2222
runs-on: ubuntu-latest
2323
strategy:
2424
matrix:
25-
benchmark-target:
26-
- { package: uu_base64 }
27-
- { package: uu_cksum }
28-
- { package: uu_cp }
29-
- { package: uu_cut }
30-
- { package: uu_dd }
31-
- { package: uu_df }
32-
- { package: uu_du }
33-
- { package: uu_expand }
34-
- { package: uu_fold }
35-
- { package: uu_join }
36-
- { package: uu_ls }
37-
- { package: uu_mv }
38-
- { package: uu_nl }
39-
- { package: uu_numfmt }
40-
- { package: uu_rm }
41-
- { package: uu_seq }
42-
- { package: uu_shuf }
43-
- { package: uu_sort }
44-
- { package: uu_split }
45-
- { package: uu_tsort }
46-
- { package: uu_unexpand }
47-
- { package: uu_uniq }
48-
- { package: uu_wc }
49-
- { package: uu_factor }
50-
- { package: uu_date }
25+
type: [performance, memory]
26+
package: [
27+
uu_base64,
28+
uu_cksum,
29+
uu_cp,
30+
uu_cut,
31+
uu_dd,
32+
uu_df,
33+
uu_du,
34+
uu_expand,
35+
uu_fold,
36+
uu_join,
37+
uu_ls,
38+
uu_mv,
39+
uu_nl,
40+
uu_numfmt,
41+
uu_rm,
42+
uu_seq,
43+
uu_shuf,
44+
uu_sort,
45+
uu_split,
46+
uu_tsort,
47+
uu_unexpand,
48+
uu_uniq,
49+
uu_wc,
50+
uu_factor,
51+
uu_date
52+
]
5153
steps:
5254
- uses: actions/checkout@v6
5355
with:
@@ -64,23 +66,23 @@ jobs:
6466
shell: bash
6567
run: cargo install cargo-codspeed --locked
6668

67-
- name: Build benchmarks for ${{ matrix.benchmark-target.package }}
69+
- name: Build benchmarks for ${{ matrix.package }} (${{ matrix.type }})
6870
shell: bash
6971
run: |
70-
echo "Building benchmarks for ${{ matrix.benchmark-target.package }}"
71-
cargo codspeed build -p ${{ matrix.benchmark-target.package }}
72+
echo "Building ${{ matrix.type }} benchmarks for ${{ matrix.package }}"
73+
if [ "${{ matrix.type }}" = "memory" ]; then
74+
cargo codspeed build -m analysis -p ${{ matrix.package }}
75+
else
76+
cargo codspeed build -p ${{ matrix.package }}
77+
fi
7278
73-
- name: Run benchmarks for ${{ matrix.benchmark-target.package }}
79+
- name: Run ${{ matrix.type }} benchmarks for ${{ matrix.package }}
7480
uses: CodSpeedHQ/action@v4
7581
env:
7682
CODSPEED_LOG: debug
7783
with:
78-
mode: simulation
84+
mode: ${{ matrix.type == 'memory' && 'memory' || 'simulation' }}
7985
run: |
80-
echo "Running benchmarks for ${{ matrix.benchmark-target.package }}"
81-
if [[ "${{ matrix.benchmark-target.package }}" == "uu_factor" ]]; then
82-
cargo codspeed run -p ${{ matrix.benchmark-target.package }}
83-
else
84-
cargo codspeed run -p ${{ matrix.benchmark-target.package }} > /dev/null
85-
fi
86+
echo "Running ${{ matrix.type }} benchmarks for ${{ matrix.package }}"
87+
cargo codspeed run -p ${{ matrix.package }} > /dev/null
8688
token: ${{ secrets.CODSPEED_TOKEN }}

‎.github/workflows/freebsd.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@ jobs:
133133
- uses: actions/checkout@v6
134134
with:
135135
persist-credentials: false
136+
- name: Avoid no space left on device (Ubuntu runner)
137+
run: sudo rm -rf /usr/share/dotnet /usr/local/lib/android
136138
- uses: Swatinem/rust-cache@v2
137139
- name: Run sccache-cache
138140
uses: mozilla-actions/sccache-action@v0.0.9
@@ -192,6 +194,7 @@ jobs:
192194
set +e
193195
cd "${WORKSPACE}"
194196
unset FAULT
197+
export RUSTFLAGS="-C strip=symbols" # for disk space
195198
cargo build || FAULT=1
196199
export PATH=~/.cargo/bin:${PATH}
197200
export RUST_BACKTRACE=1

‎.vscode/cspell.dictionaries/jargon.wordlist.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,4 +219,5 @@ TUNABLES
219219
tunables
220220
VMULL
221221
vmull
222+
SETFL
222223
tmpfs

‎Cargo.lock‎

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

0 commit comments

Comments
 (0)