Skip to content

Commit 25a223e

Browse files
ss-owicoop
andauthored
Next (11/11/22 ) (#239)
* 🎨 Correctly established directories. * ♻️ Refactor ICEs array, deprecated 'set-output'. Signed-off-by: Salvydas Lukosius <[email protected]> Signed-off-by: William Cooper <[email protected]> Co-authored-by: William Cooper <[email protected]>
1 parent 17ec2f7 commit 25a223e

25 files changed

+747
-662
lines changed

.editorconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Space or Tabs?
22
# https://stackoverflow.com/questions/35649847/objective-reasons-for-using-spaces-instead-of-tabs-for-indentation
33
# https://stackoverflow.com/questions/12093748/how-to-use-tabs-instead-of-spaces-in-a-shell-script
4+
# https://github.com/editorconfig/editorconfig-defaults/blob/master/editorconfig-defaults.json
45
#
56
# 1. What happens when I press the Tab key in my text editor?
67
# 2. What happens when I request my editor to indent one or more lines?

.github/ISSUE_TEMPLATE/01_bug_report.yml

Lines changed: 41 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: "🐞 Bug report"
22
description: File a bug report
33
title: "[bug]: "
44
labels: ["bug 🐞", "triage 📑"]
5+
assignees: ["ss-o"]
56
body:
67
- type: markdown
78
attributes:
@@ -12,44 +13,70 @@ body:
1213
attributes:
1314
label: Environment
1415
description: >
15-
Please describe your environment e.g: `echo "OSTYPE=${OSTYPE} CPUTYPE=$(uname -m) / MACHINE_TYPE=$MACHTYPE ZSH_VERSION=${ZSH_VERSION}"`
16-
17-
It may contain any additional information which would help to reproduce the issue.
18-
placeholder: "OSTYPE=linux-gnu CPUTYPE=x86_64 / MACHINE_TYPE=x86_64 ZSH_VERSION=5.8"
16+
Please describe your environment in as much detail as possible. Otherwise, we may not be able to reproduce the issue.
17+
placeholder: >
18+
Example:
19+
print "Device: $VENDOR | $OSTYPE | $CPUTYPE"
20+
print "Shell: $SHELL | $ZSH_ARGZERO | $ZSH_PATCHLEVEL"
21+
print "Zi: $(git -C $ZI[BIN_DIR] rev-parse HEAD)"
22+
validations:
23+
required: true
24+
- type: textarea
25+
id: repro
26+
attributes:
27+
label: Reproduction steps
28+
description: "How do you trigger this bug? Please walk us through it step by step."
29+
value: |
30+
1.
31+
2.
32+
3.
33+
4.
34+
5.
35+
...
36+
render: bash
1937
validations:
2038
required: true
2139
- type: textarea
2240
id: expected
2341
attributes:
2442
label: Expected behavior
2543
description: "Please describe the expected behavior"
44+
value: |
45+
1.
46+
2.
47+
3.
48+
4.
49+
5.
50+
...
51+
render: bash
2652
validations:
2753
required: true
2854
- type: textarea
2955
id: current
3056
attributes:
3157
label: Current behavior
3258
description: "Please describe how the bug manifests"
33-
validations:
34-
required: true
35-
- type: textarea
36-
id: reproduce
37-
attributes:
38-
label: Steps to reproduce
39-
description: "Explain the steps required to duplicate the issue"
59+
value: |
60+
1.
61+
2.
62+
3.
63+
4.
64+
5.
65+
...
66+
render: bash
4067
validations:
4168
required: true
4269
- type: textarea
4370
id: code-snippet
4471
attributes:
4572
label: Code snippet
46-
description: "Please insert your zshrc or just a short code snippet in concern"
73+
description: "Please insert your zshrc or just a short code snippet in concern."
4774
validations:
4875
required: true
4976
- type: textarea
5077
id: additional
5178
attributes:
52-
label: Aditional information
79+
label: Additional information
5380
description: "List any other information that is relevant to your issue. For reports and stats run `zi analytics`"
5481
validations:
5582
required: true
@@ -69,7 +96,7 @@ body:
6996
required: true
7097
- type: checkboxes
7198
attributes:
72-
label: Are you familiar with Contributor Covenant Code of Conduct?
99+
label: Are you familiar with the Contributor Covenant Code of Conduct?
73100
options:
74101
- label: I have read the [Contributor Covenant Code of Conduct](https://github.com/z-shell/zi/blob/main/docs/CODE_OF_CONDUCT.md).
75102
required: true

.github/ISSUE_TEMPLATE/02_feature_request.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: "💡 Feature request"
22
description: Suggest an idea for this project
33
title: "[feat]: "
44
labels: ["feature-request 💡"]
5+
assignees: ["ss-o"]
56
body:
67
- type: markdown
78
attributes:
@@ -18,7 +19,7 @@ body:
1819
id: code-snippet
1920
attributes:
2021
label: Related Code
21-
description: "If you are able to illustrate the bug or feature request with an example, please provide it here"
22+
description: "If you can illustrate the bug or feature request with an example, please provide it here"
2223
validations:
2324
required: false
2425
- type: textarea
@@ -46,7 +47,7 @@ body:
4647
required: true
4748
- type: checkboxes
4849
attributes:
49-
label: Are you familiar with Contributor Covenant Code of Conduct?
50+
label: Are you familiar with the Contributor Covenant Code of Conduct?
5051
options:
5152
- label: I have read the [Contributor Covenant Code of Conduct](https://github.com/z-shell/zi/blob/main/docs/CODE_OF_CONDUCT.md).
5253
required: true

.github/ISSUE_TEMPLATE/03_codebase_improvement.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
name: "✨ Codebase improvement"
2-
description: Suggest a better solution for algorithms, annexea, packages, development tools, etc.
2+
description: Suggest a better solution for algorithms, annexes, packages, development tools, etc.
33
title: "[dev]: "
44
labels: ["enhancement ✨"]
5+
assignees: ["ss-o"]
56
body:
67
- type: textarea
78
id: enhancement
@@ -31,7 +32,7 @@ body:
3132
required: true
3233
- type: checkboxes
3334
attributes:
34-
label: Are you familiar with Contributor Covenant Code of Conduct?
35+
label: Are you familiar with the Contributor Covenant Code of Conduct?
3536
options:
3637
- label: I have read the [Contributor Covenant Code of Conduct](https://github.com/z-shell/zi/blob/main/docs/CODE_OF_CONDUCT.md).
3738
required: true

.github/ISSUE_TEMPLATE/04_documentation.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
name: "📚 Documentation"
2-
description: The issue request for changes indocumentation
2+
description: The issue request for changes in documentation
33
title: "[docs]: "
44
labels: ["documentation 📝"]
5-
assignees:
6-
- ss-o
5+
assignees: ["ss-o"]
76
body:
87
- type: markdown
98
attributes:
@@ -16,7 +15,7 @@ body:
1615
1716
If you followed the documentation but things don't work, take some time to consider if it's the documentation or the code that's wrong. In the latter, prefer using the "bug" template.
1817
19-
You may proceed directly to sending a pull request without filing this issue, and we can improve on your work.
18+
You may proceed directly to sending a pull request without filing this issue, and we can improve your work.
2019
If you think some of the requirements above are not met, or if you are not able to contribute yourself, the issue is still welcomed.
2120
2221
- type: textarea
@@ -53,7 +52,7 @@ body:
5352
required: true
5453
- type: checkboxes
5554
attributes:
56-
label: Are you familiar with Contributor Covenant Code of Conduct?
55+
label: Are you familiar with the Contributor Covenant Code of Conduct?
5756
options:
5857
- label: I have read the [Contributor Covenant Code of Conduct](https://github.com/z-shell/zi/blob/main/docs/CODE_OF_CONDUCT.md).
5958
required: true

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
---
22
blank_issues_enabled: false
33
contact_links:
4-
- name: ZI Wiki
5-
url: https://z.digitalclouds.dev
6-
about: Knowledge base.
7-
- name: Community Discussions
8-
url: https://github.com/orgs/z-shell/discussions
9-
about: Please ask and answer questions here.
10-
- name: Slack Workspace
4+
- name: Wiki
5+
url: https://wiki.zshell.dev
6+
about: Knowledge base
7+
- name: Discussions
8+
url: https://discussions.zshell.dev
9+
about: Please ask and answer questions here
10+
- name: Matrix
11+
url: https://matrix.zshell.dev
12+
about: An open network for secure, decentralized communication
13+
- name: Slack
1114
url: https://join.slack.com/t/z-shell/shared_invite/zt-16twpopd2-p08ROUeT2aGZ5njJwysawA
12-
about: Join to ask and answer questions or collaborate.
13-
- name: Crowdin Translations
14-
url: https://digitalclouds.crowdin.com/z-shell
15-
about: Join to participate in translations.
16-
- name: Z-Shell Portfolio
17-
url: https://github.zshell.dev/
18-
about: Z-Shell organization portfolio and governance.
15+
about: Workspace to collaborate, ask and answer questions
16+
- name: Crowdin
17+
url: https://translate.zshell.dev
18+
about: Translation and localization management

.github/labeler.yml

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,14 @@
11
documentation 📝:
2-
- "docs/**/*.md"
3-
- "community/**/*.md"
4-
- "ecosystem/**/*.md"
5-
- ".github/*.md"
6-
- "!.github/ISSUE_TEMPLATE/*"
2+
- "docs/*.md"
3+
- "docs/man/*"
4+
enhancement ✨:
5+
- "*.zsh"
6+
- "lib/**"
77
maintenance 📈:
8-
- ".editorconfig"
9-
- ".gitattributes"
10-
- ".gitignore"
118
- ".github/CODEOWNERS"
12-
- ".github/*.md"
139
- ".github/*.yml"
14-
- ".github/*.yaml"
1510
- ".github/*.json"
16-
- ".github/**rc"
11+
- ".vscode/*"
1712
- ".trunk/**"
18-
- ".vscode/**"
19-
- "crowdin.yml"
20-
enhancement ✨:
21-
- "functions/**"
22-
- "src/**"
23-
- "lib/**"
24-
i18n 🌐:
25-
- "i18n/**"
26-
- "docs/i18n/**"
2713
ci 🤖:
28-
- ".github/workflows/*"
14+
- ".github/workflows/*.yml"

.github/workflows/zsh-n.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,17 @@
22
name: "✅ Zsh"
33
on:
44
push:
5-
branches: [main]
65
tags: ["v*.*.*"]
7-
paths: ["zi.zsh", "lib/**"]
6+
branches:
7+
- main
8+
- next
9+
paths:
10+
- "zi.zsh"
11+
- "lib/**"
812
pull_request:
9-
branches: [main]
10-
paths: ["zi.zsh", "lib/**"]
13+
paths:
14+
- "zi.zsh"
15+
- "lib/**"
1116
workflow_run:
1217
workflows:
1318
- "⭕ Trunk"
@@ -29,7 +34,8 @@ jobs:
2934
run: |
3035
MATRIX="$(find . -type d -name 'doc' -prune -o -type f \( -iname '*.zsh' -o -iname '_zi' \) -print | jq -ncR '{"include": [{"file": inputs}]}')"
3136
echo "MATRIX=${MATRIX}" >&2
32-
echo "::set-output name=matrix::${MATRIX}"
37+
echo "matrix=${MATRIX}" >> $GITHUB_OUTPUT
38+
3339
zsh-n:
3440
runs-on: ubuntu-latest
3541
needs: zsh-matrix

.github/workflows/zunit.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,14 @@ jobs:
3131
builtin cd docker/tests
3232
MATRIX="$(ls -1 *.zunit | sed 's/.zunit$//' | jq -ncR '{"include": [{"file": inputs}]}')"
3333
echo "MATRIX=${MATRIX}" >&2
34-
echo "::set-output name=matrix::${MATRIX}"
34+
echo "matrix=${MATRIX}" >> $GITHUB_OUTPUT
35+
3536
zunit:
3637
runs-on: ubuntu-latest
3738
needs: zunit-matrix
3839
strategy:
3940
fail-fast: false
40-
matrix: "${{ fromJSON(needs.zunit-matrix.outputs.matrix) }}"
41+
matrix: ${{ fromJSON(needs.zunit-matrix.outputs.matrix) }}
4142
steps:
4243
- name: Login to GitHub Container Registry
4344
uses: docker/login-action@v2

.prettierrc

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)