From 80a86caa7fc41fb9c7330579b19dfa15f42552b1 Mon Sep 17 00:00:00 2001 From: Joe Block Date: Thu, 31 Oct 2024 08:46:17 -0600 Subject: [PATCH 1/5] Include fzf plugin in local plugins example Signed-off-by: Joe Block --- .zsh-quickstart-local-plugins-example | 3 +++ 1 file changed, 3 insertions(+) mode change 100644 => 100755 .zsh-quickstart-local-plugins-example diff --git a/.zsh-quickstart-local-plugins-example b/.zsh-quickstart-local-plugins-example old mode 100644 new mode 100755 index ae3c596..1332f74 --- a/.zsh-quickstart-local-plugins-example +++ b/.zsh-quickstart-local-plugins-example @@ -93,6 +93,9 @@ fi # Supercharge your history search with fzf zgenom load unixorn/fzf-zsh-plugin +# Soup up command history search with fzf. +zgen load unixorn/fzf-zsh-plugin + # Add my bitbucket git helpers plugin. zgenom load unixorn/bitbucket-git-helpers.plugin.zsh From ca63ee20f50730dd463a93ab807c131f4b1a0de9 Mon Sep 17 00:00:00 2001 From: Joe Block Date: Thu, 31 Oct 2024 08:47:04 -0600 Subject: [PATCH 2/5] Add pre-commit configuration Signed-off-by: Joe Block --- .pre-commit-config.yaml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .pre-commit-config.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..acc7854 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,28 @@ +--- +repos: + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v4.6.0 + hooks: + - id: check-added-large-files + - id: check-executables-have-shebangs + - id: check-merge-conflict + - id: check-shebang-scripts-are-executable + - id: check-symlinks + - id: check-yaml + - id: debug-statements + - id: end-of-file-fixer + - id: forbid-submodules + - id: mixed-line-ending + - id: trailing-whitespace + + - repo: https://github.com/igorshubovych/markdownlint-cli + rev: v0.42.0 + hooks: + - id: markdownlint-fix + args: ["--ignore", "LICENSE.md", "--disable", "~MD013"] + + - repo: https://github.com/thlorenz/doctoc + rev: v2.2.0 + hooks: + - id: doctoc + args: ["--update-only"] From 713444a608b12cdf73a7b9344cb28737b211d749 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2024 14:48:36 +0000 Subject: [PATCH 3/5] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- Contributing.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributing.md b/Contributing.md index 2c6858b..dd80078 100644 --- a/Contributing.md +++ b/Contributing.md @@ -8,6 +8,7 @@ The **ZSH Quickstart Kit** is a batteries-included starter kit for using `zsh`. - [Contribution Guidelines](#contribution-guidelines) - [New Features](#new-features) +- [Readme](#readme) From 74170336ca9f756847098826d4f55651609a4780 Mon Sep 17 00:00:00 2001 From: Joe Block Date: Thu, 31 Oct 2024 08:50:20 -0600 Subject: [PATCH 4/5] shebang fixes Signed-off-by: Joe Block --- zsh/.zgen-setup | 0 zsh/.zsh_aliases | 0 zsh/.zsh_functions | 0 3 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 zsh/.zgen-setup mode change 100644 => 100755 zsh/.zsh_aliases mode change 100644 => 100755 zsh/.zsh_functions diff --git a/zsh/.zgen-setup b/zsh/.zgen-setup old mode 100644 new mode 100755 diff --git a/zsh/.zsh_aliases b/zsh/.zsh_aliases old mode 100644 new mode 100755 diff --git a/zsh/.zsh_functions b/zsh/.zsh_functions old mode 100644 new mode 100755 From b36c433e9ab79711c799a06aadd23b7cb61a005e Mon Sep 17 00:00:00 2001 From: Joe Block Date: Thu, 31 Oct 2024 09:12:17 -0600 Subject: [PATCH 5/5] Demote some megalint errors to warnings - Demote `actionlint` errors to warnings - Demote `trivy` errors to warnings Signed-off-by: Joe Block --- .github/workflows/mega-linter.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/mega-linter.yml b/.github/workflows/mega-linter.yml index 8453723..f5523c1 100644 --- a/.github/workflows/mega-linter.yml +++ b/.github/workflows/mega-linter.yml @@ -55,8 +55,10 @@ jobs: DEFAULT_BRANCH: main GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} DISABLE_LINTERS: MARKDOWN_MARKDOWN_LINK_CHECK,REPOSITORY_SECRETLINT,SPELL_CSPELL + ACTION_ACTIONLINT_DISABLE_ERRORS: true REPOSITORY_CHECKOV_DISABLE_ERRORS: true REPOSITORY_KICS_DISABLE_ERRORS: true + REPOSITORY_TRIVY_DISABLE_ERRORS: true # Upload Mega-Linter artifacts. # They will be available on Github action page "Artifacts" section