From 99e346c360ead67122725f8f86d0fe047644afc1 Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Tue, 10 Oct 2023 10:37:52 +0200 Subject: [PATCH] Upgrade shfmt from 3.4.0 to 3.7.0 (#812) --- .github/workflows/test-extensions.yml | 4 ++-- scripts/lint | 2 +- scripts/lint.bat | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-extensions.yml b/.github/workflows/test-extensions.yml index 7b59e91..cb9cdd0 100644 --- a/.github/workflows/test-extensions.yml +++ b/.github/workflows/test-extensions.yml @@ -31,9 +31,9 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: "1.17.1" + go-version: "1.21.0" - name: Install shfmt - run: GO111MODULE=on go install mvdan.cc/sh/v3/cmd/shfmt@v3.4.0 + run: GO111MODULE=on go install mvdan.cc/sh/v3/cmd/shfmt@v3.7.0 - name: Checkout uses: actions/checkout@v2 - name: Check coding style diff --git a/scripts/lint b/scripts/lint index 03eb35e..de08354 100755 --- a/scripts/lint +++ b/scripts/lint @@ -11,7 +11,7 @@ echo '# Linting shell scripts' if ! docker --version >/dev/null 2>/dev/null; then echo 'Docker is not installed, or it is not running.' >&2 rc=1 -elif ! docker run --rm -v "$SRC_DIR:/src" -w /src --entrypoint /src/scripts/invoke-shfmt mvdan/shfmt:v3.4.0-alpine fix; then +elif ! docker run --rm -v "$SRC_DIR:/src" -w /src --entrypoint /src/scripts/invoke-shfmt mvdan/shfmt:v3.7.0-alpine fix; then echo 'ERROR!' >&2 rc=1 fi diff --git a/scripts/lint.bat b/scripts/lint.bat index babca73..eee8974 100644 --- a/scripts/lint.bat +++ b/scripts/lint.bat @@ -16,7 +16,7 @@ if errorlevel 1 ( echo Docker is not installed, or it's not running >&2 set rc=1 ) else ( - docker run --rm -v "%SRC_DIR%:/src" -w /src --entrypoint /src/scripts/invoke-shfmt mvdan/shfmt:v3.4.0-alpine fix + docker run --rm -v "%SRC_DIR%:/src" -w /src --entrypoint /src/scripts/invoke-shfmt mvdan/shfmt:v3.7.0-alpine fix if errorlevel 1 ( echo ERROR! >&2 set rc=1