Skip to content

Commit

Permalink
fix: gh-r logic ignores [36]86 assets
Browse files Browse the repository at this point in the history
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 #225, #246, #247

Signed-off-by: Vladislav Doster <mvdoster@gmail.com>
  • Loading branch information
vladdoster committed May 6, 2022
1 parent 5c70f5a commit bb09d88
Show file tree
Hide file tree
Showing 8 changed files with 368 additions and 647 deletions.
18 changes: 0 additions & 18 deletions .github/workflows/delete-old-workflows.yml

This file was deleted.

13 changes: 5 additions & 8 deletions .github/workflows/documentation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,27 @@ on:
pull_request:
branches:
- main
paths:
- 'zinit*.zsh'
push:
branches:
- main
workflow_dispatch:

jobs:

zshelldoc:
runs-on: ubuntu-latest
steps:

- name: check out repository
uses: actions/checkout@v3

- name: generate zsd
run: |
make doc-container
make doc/container
sudo chown -R "$(id -u):$(id -g)" .
- name: check for out-of-date documentation
run: |
if git --no-pager diff --exit-code; then
echo "zshelldocs are up to date"
else
echo "zshelldocs in the repo are not up to date"
exit 1
if ! git --no-pager diff --exit-code; then
echo "::set-output zshelldocs are out-of-date, run 'make doc'"
fi
2 changes: 1 addition & 1 deletion .zunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ directories:
tests: tests
output: tests/_output
support: tests/_support
fail_fast: true
fail_fast: false
verbose: true
7 changes: 4 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
.EXPORT_ALL_VARIABLES:

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

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

doc-container:
doc/container:
./scripts/docker-run.sh --docs --debug

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

.PHONY: all test clean doc doc-container
.PHONY: all clean doc doc/container test
2 changes: 1 addition & 1 deletion doc/zsdoc/zinit-install.zsh.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ ____
package. Connects to Github releases page.
____
Has 110 line(s). Calls functions:
Has 130 line(s). Calls functions:
.zinit-get-latest-gh-r-url-part
`-- zinit.zsh/+zinit-message
Expand Down
5 changes: 4 additions & 1 deletion tests/_support/bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,10 @@ source $ZINIT[BIN_DIR]/zinit.zsh \
# ]]]
# Install Annexes [[[
info 'installing test dependencies'
zinit light-mode for zdharma-continuum/zinit-annex-{'bin-gem-node','default-ice'}
# ver'fix/improve-lbin-logic' \
zinit light-mode for \
zdharma-continuum/zinit-annex-binary-symlink \
zdharma-continuum/zinit-annex-{'bin-gem-node','default-ice'}
# ]]]

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

0 comments on commit bb09d88

Please sign in to comment.