Skip to content

Commit d60638f

Browse files
authored
fix: gh-r logic ignores [36]86 assets (zdharma-continuum#235)
Changes: - Reduce zunit verbosity with `--tap` flag - `gh-r` tests now use `lbin` instead of `sbin`. `lbin` has smarter logic when looking for executables to use in creating a shim - Add gh-r tests for `rust-analyzer`, `docker-compose`, `neovim` binary & appimage, and `kopia` - Condense gh-r test logic to halve LOC (i.e., 1000+ -> ~500) - Update gh-r logic to discard 32 bit binaries, improve 64 bit selection, and linux-{gnu,musl} patterns Closes zdharma-continuum#225, zdharma-continuum#246, zdharma-continuum#247 Signed-off-by: Vladislav Doster <[email protected]>
1 parent 5c70f5a commit d60638f

File tree

8 files changed

+368
-647
lines changed

8 files changed

+368
-647
lines changed

.github/workflows/delete-old-workflows.yml

-18
This file was deleted.

.github/workflows/documentation.yaml

+5-8
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,27 @@ on:
44
pull_request:
55
branches:
66
- main
7-
paths:
8-
- 'zinit*.zsh'
97
push:
108
branches:
119
- main
1210
workflow_dispatch:
1311

1412
jobs:
13+
1514
zshelldoc:
1615
runs-on: ubuntu-latest
1716
steps:
17+
1818
- name: check out repository
1919
uses: actions/checkout@v3
2020

2121
- name: generate zsd
2222
run: |
23-
make doc-container
23+
make doc/container
2424
sudo chown -R "$(id -u):$(id -g)" .
2525
2626
- name: check for out-of-date documentation
2727
run: |
28-
if git --no-pager diff --exit-code; then
29-
echo "zshelldocs are up to date"
30-
else
31-
echo "zshelldocs in the repo are not up to date"
32-
exit 1
28+
if ! git --no-pager diff --exit-code; then
29+
echo "::set-output zshelldocs are out-of-date, run 'make doc'"
3330
fi

.zunit.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ directories:
33
tests: tests
44
output: tests/_output
55
support: tests/_support
6-
fail_fast: true
6+
fail_fast: false
77
verbose: true

Makefile

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
.EXPORT_ALL_VARIABLES:
22

33
ZSH := $(shell command -v zsh 2> /dev/null)
4-
SRC := zinit.zsh zinit-side.zsh zinit-install.zsh zinit-autoload.zsh
4+
SRC := zinit{'','-autoload','-install','-side'}.zsh
5+
# zinit.zsh zinit-side.zsh zinit-install.zsh zinit-autoload.zsh
56
DOC_SRC := $(foreach wrd,$(SRC),../$(wrd))
67

78
zwc:
89
$(or $(ZSH),:) -fc 'for f in *.zsh; do zcompile -R -- $$f.zwc $$f || exit; done'
910

10-
doc-container:
11+
doc/container:
1112
./scripts/docker-run.sh --docs --debug
1213

1314
doc: clean
@@ -19,4 +20,4 @@ test:
1920
clean:
2021
rm -rvf *.zwc doc/zsdoc/zinit{'','-autoload','-install','-side'}.zsh.adoc doc/zsdoc/data/
2122

22-
.PHONY: all test clean doc doc-container
23+
.PHONY: all clean doc doc/container test

doc/zsdoc/zinit-install.zsh.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ ____
260260
package. Connects to Github releases page.
261261
____
262262
263-
Has 110 line(s). Calls functions:
263+
Has 130 line(s). Calls functions:
264264
265265
.zinit-get-latest-gh-r-url-part
266266
`-- zinit.zsh/+zinit-message

tests/_support/bootstrap

+4-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@ source $ZINIT[BIN_DIR]/zinit.zsh \
4040
# ]]]
4141
# Install Annexes [[[
4242
info 'installing test dependencies'
43-
zinit light-mode for zdharma-continuum/zinit-annex-{'bin-gem-node','default-ice'}
43+
# ver'fix/improve-lbin-logic' \
44+
zinit light-mode for \
45+
zdharma-continuum/zinit-annex-binary-symlink \
46+
zdharma-continuum/zinit-annex-{'bin-gem-node','default-ice'}
4447
# ]]]
4548

4649
# vim:ft=zsh:sw=2:sts=2:et:foldmarker=[[[,]]]:foldmethod=marker

0 commit comments

Comments
 (0)