From 40b9d778e476aecca55c42640c8011c7fad8c96c Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Mon, 1 Jun 2026 02:42:18 +0100 Subject: [PATCH 1/3] chore(zsh): apply standard modelines across plugins and libraries --- public/zsh/snippets/color.zsh | 2 ++ public/zsh/snippets/welcome.zsh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/public/zsh/snippets/color.zsh b/public/zsh/snippets/color.zsh index ef67fef..7ca8eca 100644 --- a/public/zsh/snippets/color.zsh +++ b/public/zsh/snippets/color.zsh @@ -1,3 +1,5 @@ +# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*- +# vim: ft=zsh sw=2 ts=2 et # Source: https://github.com/molovo/color # License: MIT — Copyright (c) 2015 Joe Letchford # Maintained by z-shell/src — https://github.com/z-shell/src diff --git a/public/zsh/snippets/welcome.zsh b/public/zsh/snippets/welcome.zsh index 576fac9..7948a44 100755 --- a/public/zsh/snippets/welcome.zsh +++ b/public/zsh/snippets/welcome.zsh @@ -1,3 +1,5 @@ +# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*- +# vim: ft=zsh sw=2 ts=2 et +zi-message "{auto}\`Welcome to Zi :)\`" sleep 1 +zi-message "{hi}I am the snippet\!" From 21bf3daf270cac44b8c55ff639922653d7ff88d0 Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Mon, 1 Jun 2026 04:03:35 +0100 Subject: [PATCH 2/3] chore(config): add editorconfig formatting baseline --- .editorconfig | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..1ec980b --- /dev/null +++ b/.editorconfig @@ -0,0 +1,23 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true +indent_style = space +indent_size = 2 + +[*.{md,mdx,rst}] +trim_trailing_whitespace = false + +[Makefile*] +indent_style = tab +indent_size = 4 + +[*.{py,rb}] +indent_size = 4 + +[*.{go,java}] +indent_style = tab +indent_size = 4 From f3c17e1a633e57ea59ead804f6ea2372a360cadb Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Mon, 1 Jun 2026 04:53:25 +0100 Subject: [PATCH 3/3] ci(workflows): enforce top-level concurrency --- .github/workflows/deploy-gh-pages.yml | 6 ++++-- .github/workflows/win-install.yml | 7 ++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy-gh-pages.yml b/.github/workflows/deploy-gh-pages.yml index c521d6d..6128580 100644 --- a/.github/workflows/deploy-gh-pages.yml +++ b/.github/workflows/deploy-gh-pages.yml @@ -13,6 +13,10 @@ on: permissions: contents: write +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: false + jobs: deploy: if: github.repository == 'z-shell/src' @@ -20,8 +24,6 @@ jobs: name: github-pages runs-on: ubuntu-latest timeout-minutes: 15 - concurrency: - group: ${{ github.workflow }}-${{ github.ref }} steps: - name: ⤵️ Check out code from GitHub uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 diff --git a/.github/workflows/win-install.yml b/.github/workflows/win-install.yml index 73d452a..8a185a6 100644 --- a/.github/workflows/win-install.yml +++ b/.github/workflows/win-install.yml @@ -19,6 +19,10 @@ on: permissions: contents: read +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: shellcheck: runs-on: ubuntu-latest @@ -33,9 +37,6 @@ jobs: runs-on: windows-latest timeout-minutes: 30 needs: [shellcheck] - concurrency: - group: ci-${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: false steps: - name: 🪟 Set CRLF (Windows) run: |