From d9cc3b9eda8a29acc889eb2b37c28058c44087a5 Mon Sep 17 00:00:00 2001 From: Sal <59910950+ss-o@users.noreply.github.com> Date: Thu, 8 Oct 2026 22:45:54 +0100 Subject: [PATCH 1/2] chore(github): sync the organization bug and membership forms --- .github/ISSUE_TEMPLATE/01_bug_report.yml | 74 +++++++++--------------- .github/ISSUE_TEMPLATE/05_membership.yml | 4 +- 2 files changed, 28 insertions(+), 50 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/01_bug_report.yml b/.github/ISSUE_TEMPLATE/01_bug_report.yml index 6522829d..9847bd73 100644 --- a/.github/ISSUE_TEMPLATE/01_bug_report.yml +++ b/.github/ISSUE_TEMPLATE/01_bug_report.yml @@ -7,79 +7,57 @@ body: - type: markdown attributes: value: | - First off, thanks for taking the time to contribute! Contributions are what make the open-source community such an amazing place to learn, inspire, and create. Any contributions you make will benefit everybody else and are greatly appreciated. + Thanks for reporting a bug. A report that someone else can reproduce from a clean shell gets fixed fastest, so please fill in every required field. - type: input - id: environment + id: version attributes: - label: Environment - description: > - Please describe your environment in as much detail as possible. Otherwise, we may not be able to reproduce the issue. - placeholder: > - Example: - print "Device: $VENDOR | $OSTYPE | $CPUTYPE" - print "Shell: $SHELL | $ZSH_ARGZERO | $ZSH_PATCHLEVEL" - print "Zi: $(git -C $ZI[BIN_DIR] rev-parse HEAD)" + label: Affected version + description: The release, branch or commit of this project where you see the bug. + placeholder: "ex. v1.2.0, or main at 1a2b3c4" validations: required: true - type: textarea - id: repro + id: environment attributes: - label: Reproduction steps - description: "How do you trigger this bug? Please walk us through it step by step." - value: | - 1. - 2. - 3. - 4. - 5. - ... - render: bash + label: Environment + description: > + Your Zsh version, operating system, and how this project is loaded: the plugin manager and its version or commit, or a plain `source`. Add the terminal or anything else the bug depends on. + placeholder: | + Zsh: output of `zsh --version` + OS: ex. Debian 13, macOS 15.5 + Loaded with: ex. zi at 1a2b3c4, or `source path/to/plugin.zsh` validations: required: true - type: textarea - id: expected + id: repro attributes: - label: Expected behavior - description: "Please describe the expected behavior" - value: | - 1. - 2. - 3. - 4. - 5. - ... - render: bash + label: Minimal reproduction + description: > + The shortest set of commands that shows the bug, starting from `zsh -f` (no startup files) or a clean `HOME`. Include only the configuration the bug needs. + render: zsh validations: required: true - type: textarea - id: current + id: actual attributes: - label: Current behavior - description: "Please describe how the bug manifests" - value: | - 1. - 2. - 3. - 4. - 5. - ... - render: bash + label: Actual behavior + description: What happens, with the exact output or error message. validations: required: true - type: textarea - id: code-snippet + id: expected attributes: - label: Code snippet - description: "Please insert your zshrc or just a short code snippet in concern." + label: Expected behavior + description: What you expected to happen instead. validations: required: true - type: textarea id: additional attributes: label: Additional information - description: "List any other information that is relevant to your issue. For reports and stats run `zi analytics`" + description: Logs, screenshots, or whether the bug started after an update. For Zi, the output of `zi analytics` helps. validations: - required: true + required: false - type: checkboxes attributes: label: Self-service diff --git a/.github/ISSUE_TEMPLATE/05_membership.yml b/.github/ISSUE_TEMPLATE/05_membership.yml index 748645cb..103bdfb1 100644 --- a/.github/ISSUE_TEMPLATE/05_membership.yml +++ b/.github/ISSUE_TEMPLATE/05_membership.yml @@ -80,7 +80,7 @@ body: attributes: label: Governance & Steering committee. description: > - By submitting this issue, you confirm to agree with [Organizational Governance and Policies for a Technical Steering Committee (TSC)](https://github.com/z-shell/.github/blob/main/governance/README.md) + By submitting this issue, you confirm to agree with [Organizational Governance and Policies for a Technical Steering Committee (TSC)](https://github.com/z-shell/.github/blob/main/.github/GOVERNANCE.md) options: - label: "I am familiar with and agree with the governance & technical steering committee." required: true @@ -89,7 +89,7 @@ body: attributes: label: Code of Conduct description: > - By submitting this issue, you agree to follow and will cultivate the [Code of Conduct](https://github.com/z-shell/.github/main/governance/organization/CODE-OF-CONDUCT.md) + By submitting this issue, you agree to follow and will cultivate the [Code of Conduct](https://github.com/z-shell/.github/blob/main/.github/CODE_OF_CONDUCT.md) options: - label: "I agree to sustain healthy interactions and will follow this project's Code of Conduct" required: true From ed430f25965415b3dba7ad7444fd27c2719d877a Mon Sep 17 00:00:00 2001 From: Sal <59910950+ss-o@users.noreply.github.com> Date: Fri, 9 Oct 2026 13:17:58 +0100 Subject: [PATCH 2/2] ci(policy): repin the organization commit-lint workflow --- .github/workflows/commit-lint.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/commit-lint.yml b/.github/workflows/commit-lint.yml index 915c70a5..d9c9d7bf 100644 --- a/.github/workflows/commit-lint.yml +++ b/.github/workflows/commit-lint.yml @@ -15,13 +15,13 @@ on: permissions: contents: read -# No concurrency block here: the called workflow declares its own group from -# github.workflow and github.ref, which resolve to the caller's values, so a -# second declaration at this level deadlocks against it. +# No concurrency group, here or in the called workflow (z-shell/zi#597): these +# required checks finish in seconds, and a cancelled run for a required context +# can keep a pull request blocked. jobs: policy: name: Policy permissions: contents: read - uses: z-shell/.github/.github/workflows/commit-lint.yml@64a427d8ac33c9ef1dc89af35920eb0d3de9fa9c # main + uses: z-shell/.github/.github/workflows/commit-lint.yml@6fac3d47a61b27db54e50a0519c1e79b2935eda4 # main