From ac4b7672362a4e6cee18baec11f9383b2151cc44 Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Wed, 21 Aug 2024 08:37:23 +0200 Subject: [PATCH] Upgrade shfmt from 3.7.0 to 3.9.0 (#965) --- .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 f35486e..1d233b8 100644 --- a/.github/workflows/test-extensions.yml +++ b/.github/workflows/test-extensions.yml @@ -31,10 +31,10 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: "1.21.0" + go-version: ">=1.22.6" cache: false - name: Install shfmt - run: GO111MODULE=on go install mvdan.cc/sh/v3/cmd/shfmt@v3.7.0 + run: GO111MODULE=on go install mvdan.cc/sh/v3/cmd/shfmt@v3.9.0 - name: Checkout uses: actions/checkout@v4 - name: Check coding style diff --git a/scripts/lint b/scripts/lint index de08354..6c176eb 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.7.0-alpine fix; then +elif ! docker run --rm -v "$SRC_DIR:/src" -w /src --entrypoint /src/scripts/invoke-shfmt mvdan/shfmt:v3.9.0-alpine fix; then echo 'ERROR!' >&2 rc=1 fi diff --git a/scripts/lint.bat b/scripts/lint.bat index eee8974..0190967 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.7.0-alpine fix + docker run --rm -v "%SRC_DIR%:/src" -w /src --entrypoint /src/scripts/invoke-shfmt mvdan/shfmt:v3.9.0-alpine fix if errorlevel 1 ( echo ERROR! >&2 set rc=1