From 06e854d6566b7093a2da975ad34a8b08c234966c Mon Sep 17 00:00:00 2001 From: Sandor Semsey Date: Mon, 17 Nov 2025 14:00:22 +0100 Subject: [PATCH 1/3] CI/beautysh: doesn't need setuptools --- .github/workflows/beautysh.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/beautysh.yml b/.github/workflows/beautysh.yml index c0e1b12..2474191 100644 --- a/.github/workflows/beautysh.yml +++ b/.github/workflows/beautysh.yml @@ -23,9 +23,7 @@ jobs: - name: Create requirements.txt run: | mkdir -p .github/workflows/es-progress/.github - # it seems beautysh in Python 3.11+ requires setuptools explicitly - echo setuptools > .github/workflows/es-progress/.github/requirements.txt - echo beautysh >> .github/workflows/es-progress/.github/requirements.txt + echo beautysh > .github/workflows/es-progress/.github/requirements.txt - name: Setup Python uses: actions/setup-python@v5 From 25e72a3c0ebc50d1dda1f1b73666dd22b0cdf4c2 Mon Sep 17 00:00:00 2001 From: Sandor Semsey Date: Mon, 17 Nov 2025 14:07:28 +0100 Subject: [PATCH 2/3] CI/beautysh: add --variable-style braces to default --- .github/workflows/beautysh.yml | 2 +- .github/workflows/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/beautysh.yml b/.github/workflows/beautysh.yml index 2474191..f77f7f0 100644 --- a/.github/workflows/beautysh.yml +++ b/.github/workflows/beautysh.yml @@ -11,7 +11,7 @@ on: description: Options to beautysh type: string required: false - default: --force-function-style paronly + default: --force-function-style paronly --variable-style braces jobs: beautysh: name: Run beautysh diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 957775f..f170023 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ jobs: uses: ./.github/workflows/beautysh.yml with: dir: tests/workflows - params: --force-function-style fnpar --indent-size 2 + params: --force-function-style fnpar --indent-size 2 --variable-style braces test-mkdocs: name: Test workflow (mkdocs) From 00c8bc1dfbac5435e3705c9b5fdf73522993ee11 Mon Sep 17 00:00:00 2001 From: Sandor Semsey Date: Mon, 17 Nov 2025 14:11:55 +0100 Subject: [PATCH 3/3] CI/beautysh: fix format in test file --- tests/workflows/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/workflows/test.sh b/tests/workflows/test.sh index 897ea82..fb829f7 100755 --- a/tests/workflows/test.sh +++ b/tests/workflows/test.sh @@ -14,7 +14,7 @@ IFS=$'\n\t' for f in *.m3u do - grep -qi "hq.*mp3" "$f" \ + grep -qi "hq.*mp3" "${f}" \ && echo -e "'Playlist ${f} contains a HQ file in mp3 format'" done