Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit eaf7ff4

Browse files
committedOct 10, 2021
Merge branch 'master' into ira/fix-knife-load
* master: (113 commits) skip go tests when go is not available plugins: Add ble.sh plugin clean up pyenv plugin Lint: prepare `lib/utilities` for `shellcheck` (Bash-it#1933) plugin/base: improvements (Bash-it#1930) plugins/percol: `bind` completion/git: `shfmt` && `shellcheck` completion/git: expand search range plugin/percol: `shellcheck` & `shfmt` plugins/percol: use `_command_exists` completion/pip: simplify code flow plugin/less-pretty-cat: remove `|| cat` completion/wpscan: simplify code flow (whitespace) plugins/less-pretty-cat: simplify code flow plugins/less-pretty-cat: use `_command_exists` lib/helpers: cite `_bash-it-find-in-ancestor()` gradle: adopt `_bash_it_find_in_ancestor()` lib/helpers: new function `_bash-it-find-in-ancestor()` completion/laravel: simplify code flow plugin/ruby: add missing parameter error message ...
2 parents 79abc59 + cf08fca commit eaf7ff4

File tree

134 files changed

+1167
-994
lines changed

Some content is hidden

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

134 files changed

+1167
-994
lines changed
 

‎.editorconfig

+3-2
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,18 @@ insert_final_newline = true
1313
trim_trailing_whitespace = false
1414

1515
[.git*]
16+
indent_size = tab
1617
indent_style = tab
1718

1819
[{**.*sh,test/run}]
20+
indent_size = tab
1921
indent_style = tab
20-
indent_size = 4
2122

2223
shell_variant = bash
2324
binary_next_line = true # like -bn
2425
switch_case_indent = true # like -ci
2526
space_redirects = true # like -sr
26-
keep_padding = false # like -kp
27+
keep_padding = false # like -kp
2728
end_of_line = lf
2829
charset = utf-8
2930
trim_trailing_whitespace = true

‎.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
bats-test:
1212
strategy:
1313
matrix:
14-
os: [ubuntu-20.04, ubuntu-18.04, ubuntu-16.04, macos-10.15]
14+
os: [ubuntu-20.04, ubuntu-18.04, macos-10.15, macos-11.0]
1515

1616
runs-on: ${{ matrix.os }}
1717

0 commit comments

Comments
 (0)
Please sign in to comment.