From 507ae61d1b3ac3f66273a00fad1321af8c6df260 Mon Sep 17 00:00:00 2001 From: R Date: Mon, 23 May 2022 21:05:49 +0200 Subject: [PATCH] ci(choco): update chocolatey to 1.1.0 (#1164) * fix(editorconfig,megalinter): enforce space style * ignore install.sh since it's auto-generated * simplify editorconfig * ci(choco): update chocolatey to 1.1.0 Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- .editorconfig | 8 ++++++-- .github/actions/choco/Dockerfile | 2 +- .mega-linter.yml | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.editorconfig b/.editorconfig index 026afb4..122c37f 100644 --- a/.editorconfig +++ b/.editorconfig @@ -8,10 +8,14 @@ trim_trailing_whitespace = true indent_style = tab indent_size = 4 -[{Dockerfile,*.md,*_test.go,install.sh,.github/actions/choco/entrypoint.sh,act-cli.nuspec}] +[{*.md,*_test.go}] indent_style = unset indent_size = unset -[*.{yml,yaml,js,json}] +[**/Dockerfile] +indent_style = space +indent_size = 2 + +[*.{yml,yaml,js,json,sh,nuspec}] indent_style = space indent_size = 2 diff --git a/.github/actions/choco/Dockerfile b/.github/actions/choco/Dockerfile index 9e1bb10..acfaa36 100644 --- a/.github/actions/choco/Dockerfile +++ b/.github/actions/choco/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:latest -ARG CHOCOVERSION=0.11.3 +ARG CHOCOVERSION=1.1.0 RUN apk add --no-cache bash ca-certificates git \ && apk --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing add mono mono-dev \ diff --git a/.mega-linter.yml b/.mega-linter.yml index 8bd91d9..d1d492d 100644 --- a/.mega-linter.yml +++ b/.mega-linter.yml @@ -12,7 +12,7 @@ DISABLE_LINTERS: - YAML_YAMLLINT - MARKDOWN_MARKDOWN_TABLE_FORMATTER - MARKDOWN_MARKDOWN_LINK_CHECK -FILTER_REGEX_EXCLUDE: .*testdata/* +FILTER_REGEX_EXCLUDE: (.*testdata/*|install.sh) MARKDOWN_MARKDOWNLINT_CONFIG_FILE: .markdownlint.yml PARALLEL: false PRINT_ALPACA: false