Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
sylvestre authored Apr 30, 2024
2 parents 06158ac + 58d98df commit 2033816
Show file tree
Hide file tree
Showing 44 changed files with 1,569 additions and 486 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/CICD.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ on:
pull_request:
push:
tags:
- '*'
branches:
- main

Expand Down Expand Up @@ -541,6 +542,9 @@ jobs:
PKG_BASENAME=${PROJECT_NAME}-${REF_TAG:-$REF_SHAS}-${{ matrix.job.target }}
PKG_NAME=${PKG_BASENAME}${PKG_suffix}
outputs PKG_suffix PKG_BASENAME PKG_NAME
# deployable tag? (ie, leading "vM" or "M"; M == version number)
unset DEPLOY ; if [[ $REF_TAG =~ ^[vV]?[0-9].* ]]; then DEPLOY='true' ; fi
outputs DEPLOY
# DPKG architecture?
unset DPKG_ARCH
case ${{ matrix.job.target }} in
Expand Down Expand Up @@ -746,7 +750,7 @@ jobs:
fi
- name: Publish
uses: softprops/action-gh-release@v2
if: startsWith(github.ref, 'refs/tags/')
if: steps.vars.outputs.DEPLOY
with:
files: |
${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_NAME }}
Expand Down
48 changes: 31 additions & 17 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ half = "2.4"
hostname = "0.4"
indicatif = "0.17"
itertools = "0.12.1"
libc = "0.2.153"
libc = "0.2.154"
lscolors = { version = "0.16.0", default-features = false, features = [
"gnu_legacy",
] }
Expand Down Expand Up @@ -329,13 +329,13 @@ textwrap = { version = "0.16.1", features = ["terminal_size"] }
thiserror = "1.0"
time = { version = "0.3" }
unicode-segmentation = "1.11.0"
unicode-width = "0.1.11"
unicode-width = "0.1.12"
utf-8 = "0.7.6"
walkdir = "2.5"
winapi-util = "0.1.6"
winapi-util = "0.1.8"
windows-sys = { version = "0.48.0", default-features = false }
xattr = "1.3.1"
zip = { version = "1.1.1", default-features = false, features = ["deflate"] }
zip = { version = "1.1.2", default-features = false, features = ["deflate"] }

hex = "0.4.3"
md-5 = "0.10.6"
Expand Down
7 changes: 7 additions & 0 deletions docs/src/extensions.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,3 +82,10 @@ We support `--sort=name`, which makes it possible to override an earlier value.

`du` allows `birth` and `creation` as values for the `--time` argument to show the creation time. It
also provides a `-v`/`--verbose` flag.

## `id`

`id` has three additional flags:
* `-P` displays the id as a password file entry
* `-p` makes the output human-readable
* `-A` displays the process audit user ID
Loading

0 comments on commit 2033816

Please sign in to comment.