From b998723321461f1edfc373702dc57897d1cb6e44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 22 Nov 2024 08:25:36 +0100 Subject: [PATCH 1/3] ci/editorconfig-v2: useless use of cat --- .github/workflows/editorconfig-v2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/editorconfig-v2.yml b/.github/workflows/editorconfig-v2.yml index b14f76637458c..f3f4d59eef9bf 100644 --- a/.github/workflows/editorconfig-v2.yml +++ b/.github/workflows/editorconfig-v2.yml @@ -38,7 +38,7 @@ jobs: nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/c473cc8714710179df205b153f4e9fa007107ff9.tar.gz - name: Checking EditorConfig run: | - cat "$HOME/changed_files" | nix-shell -p editorconfig-checker --run 'xargs -r editorconfig-checker -disable-indent-size' + < "$HOME/changed_files" nix-shell -p editorconfig-checker --run 'xargs -r editorconfig-checker -disable-indent-size' - if: ${{ failure() }} run: | echo "::error :: Hey! It looks like your changes don't follow our editorconfig settings. Read https://editorconfig.org/#download to configure your editor so you never see this error again." From 2adf40958121195ad7adb5d1926a876977fe7faa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 22 Nov 2024 08:31:48 +0100 Subject: [PATCH 2/3] ci/check-nixf-tidy: replace sed with variable substitution Update .github/workflows/check-nixf-tidy.yml Co-authored-by: Zhong Jianxin --- .github/workflows/check-nixf-tidy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-nixf-tidy.yml b/.github/workflows/check-nixf-tidy.yml index de74ae8b5372a..481ae2df4c31f 100644 --- a/.github/workflows/check-nixf-tidy.yml +++ b/.github/workflows/check-nixf-tidy.yml @@ -107,7 +107,7 @@ jobs: echo "$errors" else # just print in plain text - echo "$errors" | sed 's/^:://' + echo "${errors/::/}" echo # add one empty line fi failedFiles+=("$dest") From eeb87082a9c5cd3eb72ecde71a06831256ef748b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 22 Nov 2024 08:32:01 +0100 Subject: [PATCH 3/3] add actionlint script --- .github/workflows/lint-actions.sh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100755 .github/workflows/lint-actions.sh diff --git a/.github/workflows/lint-actions.sh b/.github/workflows/lint-actions.sh new file mode 100755 index 0000000000000..43d6e801caf68 --- /dev/null +++ b/.github/workflows/lint-actions.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash actionlint shellcheck -I nixpkgs=../.. +set -euo pipefail + +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" +cd "$SCRIPT_DIR/../.." +actionlint