Skip to content

Commit dc8f1cd

Browse files
vladdostervladdoster
authored
Merge branch 'main' into feat/smart-completion
2 parents 6eeb57b + f298529 commit dc8f1cd

29 files changed

+5378
-307
lines changed

‎.commitlintrc‎

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

‎.github/ISSUE_TEMPLATE/bug-report.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ body:
1414
## Self Check
1515
1616
- Look for similar errors in existing [GitHub Issues](https://github.com/zdharma-continuum/zinit/issues?q=is%3Aissue) (open or closed).
17-
- Try reaching out on the [Gitter server](https://gitter.im/zdharma-continuum/community/) for help.
17+
- Try reaching out on the [Gitter server](https://matrix.to/#/#zdharma-continuum_community:gitter.im) for help.
1818
1919
- type: textarea
2020
id: what-happened

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ contact_links:
33
- name: Support
44
url: https://github.com/zdharma-continuum/zinit/discussions
55
about: Ask the community for support
6-
- name: Get help on Gitter
7-
url: https://gitter.im/zdharma-continuum/community/
6+
- name: Get help on Matrix
7+
url: https://matrix.to/#/#zdharma-continuum_community:gitter.im
88
about: Have a quick question? Join the Gitter community and ask your question.

‎.github/workflows/bump-homebrew-formula.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
runs-on: macos-latest
1212
steps:
1313
- name: Checkout repository
14-
uses: actions/checkout@v4
14+
uses: actions/checkout@v6
1515

1616
- name: Bump Homebrew formulae
17-
uses: dawidd6/action-homebrew-bump-formula@v3
17+
uses: dawidd6/action-homebrew-bump-formula@v7
1818
with:
1919
formula: zinit
2020
# A Personal Access Token (PAT) is instead of the default

‎.github/workflows/containers.yaml‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,11 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
zsh_version:
18-
- 5.2.4
19-
- 5.3.1
20-
- 5.4.2
21-
- 5.5.1
22-
- 5.6.2
23-
- 5.7.1
2418
- 5.8
2519
- 5.9
2620
steps:
2721
- name: check out repository code
28-
uses: actions/checkout@v4
22+
uses: actions/checkout@v6
2923

3024
- name: Grab git slugs (short commit id, branch etc.)
3125
uses: rlespinasse/github-slug-action@v3.x
@@ -49,7 +43,7 @@ jobs:
4943

5044
- name: build and push
5145
id: docker_build_zsh_versions
52-
uses: docker/build-push-action@v5
46+
uses: docker/build-push-action@v6
5347
timeout-minutes: 90 # compiling older zsh versions take a long time
5448
with:
5549
push: ${{ github.event.number == 0 }}
@@ -67,7 +61,7 @@ jobs:
6761
runs-on: ubuntu-latest
6862
steps:
6963
- name: checkout code
70-
uses: actions/checkout@v4
64+
uses: actions/checkout@v6
7165

7266
- name: get vcs details
7367
uses: rlespinasse/github-slug-action@v3.x
@@ -91,7 +85,7 @@ jobs:
9185

9286
- name: build & push new image
9387
id: docker_build_latest
94-
uses: docker/build-push-action@v5
88+
uses: docker/build-push-action@v6
9589
if: github.ref == 'refs/heads/main'
9690
with:
9791
push: true

‎.github/workflows/documentation.yaml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ on:
99
push:
1010
branches:
1111
- main
12+
paths:
13+
- 'zinit*.zsh'
1214
workflow_dispatch:
1315

1416
jobs:
@@ -17,17 +19,18 @@ jobs:
1719
steps:
1820

1921
- name: checkout repository
20-
uses: actions/checkout@v4
22+
uses: actions/checkout@v6
2123
with:
22-
repository: ${{ github.event.pull_request.head.repo.full_name }}
23-
ref: ${{ github.event.pull_request.head.ref }}
24+
repository: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
25+
ref: ${{ github.event.pull_request.head.ref || github.ref }}
2426

2527
- name: re-generate documentation
2628
run: |
2729
make doc/container
2830
sudo chown -R "$(id -u):$(id -g)" .
2931
30-
- name: commit changes to the current branch
32+
- name: commit and push updated docs
33+
if: github.event_name != 'pull_request'
3134
uses: EndBug/add-and-commit@v9
3235
with:
3336
add: 'doc'

‎.github/workflows/labeler.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414

1515
steps:
16-
- uses: actions/labeler@v5
16+
- uses: actions/labeler@v6
1717
with:
1818
repo-token: "${{ secrets.GITHUB_TOKEN }}"
1919
sync-labels: true

‎.github/workflows/linting.yaml‎

Lines changed: 56 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,39 +10,69 @@ on:
1010
workflow_dispatch:
1111

1212
jobs:
13-
14-
lint:
15-
name: Lint
13+
mdlint:
14+
name: Markdown Lint
1615
runs-on: ubuntu-latest
1716
steps:
18-
- uses: actions/checkout@v4
19-
with:
20-
fetch-depth: '0'
17+
- uses: actions/checkout@v6
2118

22-
- uses: actions/setup-python@v5
19+
- uses: xt0rted/markdownlint-problem-matcher@v3
2320

24-
- name: install dependencies
25-
run: |
26-
sudo apt-get install --yes zsh
27-
pip install --user linkify-it-py mdformat mdformat-config mdformat-gfm mdformat-shfmt mdformat-tables mdformat-toc
21+
- run: npm install -g markdownlint-cli
22+
# disabled checks:
23+
# MD013/line-length
24+
# MD024/no-duplicate-heading
25+
# MD033/no-inline-html
26+
# MD034/no-bare-urls
27+
# MD036/no-emphasis-as-heading
28+
# MD041/first-line-heading/first-line-h1
29+
# MD059/descriptive-link-text
30+
# MD060/table-column-style
31+
- run: |
32+
markdownlint --version
2833
29-
- name: commit
30-
uses: wagoid/commitlint-github-action@v5
31-
with:
32-
configFile: '.commitlintrc'
33-
# run: commitlint --from=$(git cherry origin/main | head -n 1 | awk '{print $2}')
34+
# List files to lint
35+
ls *.md **/*.md
3436
35-
- name: markdown
36-
run: find . -name '*.md' ! -name 'CHANGELOG.md' -type f -print0 | xargs -0 -n1 -P4 mdformat --check --wrap 120 --number
37+
markdownlint \
38+
--disable MD013 MD024 MD029 MD033 MD034 MD036 MD041 MD059 MD060 \
39+
--ignore '**/CHANGELOG.md' \
40+
-- *.md **/*.md
3741
38-
# - name: shell (shfmt)
39-
# run: find . -name '*.sh' -type f -print0 | xargs -0 -n1 -P4 shfmt -bn -ci -d -i 2 -ln bash -s -sr
42+
zshlint:
43+
name: ZSH Lint
44+
runs-on: ubuntu-latest
4045

41-
# - name: shell (shellcheck)
42-
# run: find . -name '*.sh' -type f -print0 | xargs -0 -n1 -P4 shellcheck
46+
strategy:
47+
fail-fast: false
48+
matrix:
49+
task: [zsh-noexec, zsh-zcompile]
4350

44-
- name: zsh (noexec)
45-
run: find . -name '*.zsh' -type f -print0 | xargs -0 -n1 -P4 zsh -n
51+
steps:
52+
- uses: actions/checkout@v6
53+
with:
54+
fetch-depth: 0
55+
56+
- uses: actions/setup-python@v6
4657

47-
- name: zsh (zcompile)
48-
run: find . -name '*.zsh' -type f -exec zsh -fc "zcompile {}" \;
58+
- name: install dependencies
59+
run: |
60+
sudo apt-get update
61+
sudo apt-get install --yes zsh
62+
63+
- name: "run lint (${{ matrix.task }})"
64+
run: |
65+
case "${{ matrix.task }}" in
66+
zsh-noexec)
67+
find . -name '*.zsh' -type f -print0 \
68+
| xargs -0 -n1 -P4 zsh -n
69+
;;
70+
zsh-zcompile)
71+
find . -name '*.zsh' -type f \
72+
-exec zsh -fc "zcompile {}" \;
73+
;;
74+
*)
75+
echo "ERROR: unknown task ${{ matrix.task }}" >&2
76+
exit 1
77+
;;
78+
esac

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ jobs:
88
name: release
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v4
12-
- uses: actions/setup-node@v4
11+
- uses: actions/checkout@v6
12+
- uses: actions/setup-node@v6
1313
with:
1414
node-version: '20'
1515

‎.github/workflows/tests.yaml‎

Lines changed: 22 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,21 @@ jobs:
2626
zunit-tests:
2727
runs-on: ${{ matrix.os }}
2828
strategy:
29-
matrix:
30-
os: ["macos-latest", "ubuntu-latest"]
3129
fail-fast: false
30+
matrix:
31+
os: [macos-latest, ubuntu-latest]
32+
zunit_test:
33+
- annexes
34+
- commands
35+
- compile
36+
- gh-r
37+
- ices
38+
- plugins
39+
- snippets
3240

3341
steps:
3442
- name: checkout ${{ github.repository }}
35-
uses: actions/checkout@v4
43+
uses: actions/checkout@v6
3644
with:
3745
fetch-depth: 0
3846

@@ -46,7 +54,7 @@ jobs:
4654
sudo apt-get update --yes
4755
sudo apt-get install --no-install-recommends --yes \
4856
autoconf automake autotools-dev \
49-
build-essential byacc\
57+
build-essential byacc \
5058
file \
5159
gcc gettext glibc-source grep \
5260
libc6 libc6-dev libevent-dev libncurses5-dev libncursesw5-dev libtool libuvc0 lua5.1 \
@@ -59,34 +67,19 @@ jobs:
5967
- name: "install dependencies"
6068
id: install-deps
6169
run: |
62-
brew install --force --overwrite autoconf automake binutils byacc cmake coreutils curl gettext gnu-sed libevent libtool libuv lua lua@5.4 make ncurses ninja parallel pkg-config texinfo unzip xz zsh
70+
brew install --force --overwrite autoconf automake binutils byacc coreutils curl gettext gnu-sed libevent libtool libuv lua lua@5.4 make ncurses ninja parallel pkg-config texinfo unzip xz zsh
6371
brew link --force --overwrite ncurses
6472
6573
- name: "install zunit"
6674
id: install-zunit
6775
shell: zsh {0}
6876
run: |
69-
mkdir -p "$HOME/.local/bin" && echo "$HOME/.local/bin" >> $GITHUB_PATH
70-
git clone --depth 1 https://github.com/zdharma-continuum/zunit; cd ./zunit
71-
./configure --prefix=$HOME/.local && make all install
72-
73-
- name: "gh-r"
74-
run: $HOME/.local/bin/zunit run --verbose tests/gh-r.zunit
75-
76-
- name: "annexes"
77-
run: zunit run tests/annexes.zunit
78-
79-
- name: "commands"
80-
run: zunit run tests/commands.zunit
81-
82-
- name: "compile"
83-
run: zunit run tests/compile.zunit
84-
85-
- name: "ices"
86-
run: zunit run tests/ices.zunit
87-
88-
- name: "plugins"
89-
run: zunit run tests/plugins.zunit
90-
91-
- name: "snippets"
92-
run: zunit run tests/snippets.zunit
77+
mkdir -p "$HOME/.local/bin"
78+
echo "$HOME/.local/bin" >> $GITHUB_PATH
79+
git clone --depth 1 https://github.com/zdharma-continuum/zunit
80+
cd ./zunit
81+
./configure --prefix=$HOME/.local
82+
make all install
83+
84+
- name: "run tests"
85+
run: zunit run tests/${{ matrix.zunit_test }}.zunit

0 commit comments

Comments
 (0)