Skip to content

Commit

Permalink
Merge branch 'master' into issue-56
Browse files Browse the repository at this point in the history
  • Loading branch information
GabrielSimonetto committed Oct 30, 2021
2 parents d1c905c + 01b6dc8 commit 704a4ef
Show file tree
Hide file tree
Showing 25 changed files with 613 additions and 1,116 deletions.
23 changes: 23 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -274,3 +274,26 @@ jobs:
# with:
# name: 'ouch-x86_64-pc-windows-gnu'
# path: target\x86_64-pc-windows-gnu\release\ouch.exe

fmt:
name: Check sourcecode format
runs-on: ubuntu-latest

steps:
- name: Checkout sources
uses: actions/checkout@v2

- name: Install toolchain
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly
target: x86_64-unknown-linux-musl
components: rustfmt
override: true

- name: Check format with cargo fmt
uses: actions-rs/cargo@v1
with:
command: fmt
args: --all -- --check
15 changes: 15 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Thanks for your interest in contributing to `ouch`!

Feel free to open an issue anytime you wish to ask a question, suggest a feature, report a bug, etc.

# Requirements

1. Be kind, considerate and respectfull.
2. If editing .rs files, run `rustfmt` on them before commiting.

Note that we are using `unstable` features of `rustfmt`, so you will need to change your toolchain to nightly.

# Suggestions

1. Ask for some guidance before solving an error if you feel like it.
2. If editing Rust code, run `clippy` before commiting.
194 changes: 170 additions & 24 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ description = "A command-line utility for easily compressing and decompressing f
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
clap = "=3.0.0-beta.5" # Keep it pinned while in beta!
atty = "0.2.14"
fs-err = "2.6.0"
lazy_static = "1.4.0"
once_cell = "1.8.0"
walkdir = "2.3.2"
strsim = "0.10.0"
bzip2 = "0.4.3"
libc = "0.2.103"
tar = "0.4.37"
Expand Down
Loading

0 comments on commit 704a4ef

Please sign in to comment.