Conversation
Remove obsolete cspell word lists, editorconfig, vscode settings, and retired workflows (rebase, stale, sync-labels, wrangler). Drop legacy installer scripts i.sh and install_alpha.sh.
- Bump actions/checkout to v6.0.2 and shellcheck to 2.0.0 - Add lib/zsh/** and tests/** to push/PR path triggers - Add permissions: contents: read and timeout-minutes: 10 - Use github.ref in concurrency group - Replace ~/.zi hard-coded paths with XDG_DATA_HOME equivalents - Add unit-fixture step calling tests/installers.sh - Remove wrangler deploy job; update trunk linter config
sync-init.sh verifies (and optionally replaces) the local lib/zsh/init.zsh against the canonical GitHub raw main copy. Supports --write, --local, --remote, --checksum-url and --no-checksum flags. tests/installers.sh provides a POSIX sh test suite covering: - script syntax validation (sh -n / zsh -n) - checksum integrity checks - loader install with XDG path and branch-override assertions - standalone zpmod delegation test - sync-init fixture round-trip test
install.sh: - Add set -eu; use WORKDIR=$(mktemp -d) with safe trap cleanup - Replace ~/.zi with XDG_DATA_HOME-aware path - Fix sed command for ZI[STREAM] substitution - Correct cd fallback from return to exit 1 - Guard branch pull with BOPT; add exit 1 on failed clone - Fix .zshrc loader snippet variable quoting install_zpmod.sh: - Add set -eu, file header and WORKDIR trap - Add pure-POSIX _zi_ver_ge() replacing expr string comparison - Honour XDG_DATA_HOME for ZI_HOME default - Replace exit 255 with exit 1 throughout lib/zsh/init.zsh: - Update default branch to use ZI[STREAM] parameter - Align loader paths with XDG layout
- Exclude AI agent instruction files from git tracking (AGENTS.md, CLAUDE.md, GEMINI.md, .github/copilot-instructions.md) - Add .geminiignore - Regenerate lib/checksum.txt to reflect updated scripts - Document sync-init.sh usage in docs/README.md - Remove deprecated git.io short URLs from README
* ci(check-linux): add init.zsh sync-drift detection step * fix(install.sh): verify zi.zsh exists after clone, not just directory * ci: add concurrency to checksum.yml; add smoke-test to win-install.yml Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat: add color.zsh from molovo/color (MIT) * feat: add revolver from molovo/revolver (MIT) * chore: rename repo references from zi-src to src Update all internal references to reflect the repository rename: - .trunk/trunk.yaml repo name - workflow repository guards (checksum, rclone-action, deploy-gh-pages) - win-install safe.directory path - docs/README.md VSCode and jsDelivr URLs * ci: add org project tracker scripts (label sync + workflow rollout) * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Signed-off-by: Sall <59910950+ss-o@users.noreply.github.com> * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Signed-off-by: Sall <59910950+ss-o@users.noreply.github.com> * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Signed-off-by: Sall <59910950+ss-o@users.noreply.github.com> * fix: address review feedback for revolver process check and installer URLs Agent-Logs-Url: https://github.com/z-shell/src/sessions/3295a818-69b9-4b0d-99f8-bf27b90e3b7c Co-authored-by: ss-o <59910950+ss-o@users.noreply.github.com> * fix: validate revolver pid before liveness check Agent-Logs-Url: https://github.com/z-shell/src/sessions/3295a818-69b9-4b0d-99f8-bf27b90e3b7c Co-authored-by: ss-o <59910950+ss-o@users.noreply.github.com> --------- Signed-off-by: Sall <59910950+ss-o@users.noreply.github.com>
Signed-off-by: Sall <59910950+ss-o@users.noreply.github.com>
…updates (#173) Bumps the github-actions group with 5 updates in the / directory: | Package | From | To | | --- | --- | --- | | [actions/checkout](https://github.com/actions/checkout) | `6.0.2` | `7.0.1` | | [z-shell/.github/actions/commit](https://github.com/z-shell/.github) | `1.0.8` | `1.1.1` | | [peaceiris/actions-gh-pages](https://github.com/peaceiris/actions-gh-pages) | `4.0.0` | `4.1.0` | | [z-shell/.github/actions/rclone](https://github.com/z-shell/.github) | `1.0.8` | `1.1.1` | | [egor-tensin/setup-cygwin](https://github.com/egor-tensin/setup-cygwin) | `4.0.1` | `4.0.2` | Updates `actions/checkout` from 6.0.2 to 7.0.1 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@de0fac2...3d3c42e) Updates `z-shell/.github/actions/commit` from 1.0.8 to 1.1.1 - [Release notes](https://github.com/z-shell/.github/releases) - [Commits](z-shell/.github@91068ee...3222f53) Updates `peaceiris/actions-gh-pages` from 4.0.0 to 4.1.0 - [Release notes](https://github.com/peaceiris/actions-gh-pages/releases) - [Changelog](https://github.com/peaceiris/actions-gh-pages/blob/main/CHANGELOG.md) - [Commits](peaceiris/actions-gh-pages@4f9cc66...84c30a8) Updates `z-shell/.github/actions/rclone` from 1.0.8 to 1.1.1 - [Release notes](https://github.com/z-shell/.github/releases) - [Commits](z-shell/.github@91068ee...3222f53) Updates `egor-tensin/setup-cygwin` from 4.0.1 to 4.0.2 - [Release notes](https://github.com/egor-tensin/setup-cygwin/releases) - [Changelog](https://github.com/egor-tensin/setup-cygwin/blob/master/CHANGELOG.md) - [Commits](egor-tensin/setup-cygwin@d2c752b...fca9069) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: 7.0.1 dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions - dependency-name: z-shell/.github/actions/commit dependency-version: 1.1.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions - dependency-name: peaceiris/actions-gh-pages dependency-version: 4.1.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions - dependency-name: z-shell/.github/actions/rclone dependency-version: 1.1.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions - dependency-name: egor-tensin/setup-cygwin dependency-version: 4.0.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
|
@copilot resolve the merge conflicts in this pull request |
|
@ss-o I'm unable to start working on this because of repository rules that prevent me from pushing to the branch:
See the documentation for more details. |
There was a problem hiding this comment.
Pull request overview
This PR modernizes the repository’s CI and maintenance automation while updating Zi bootstrap/install tooling for improved XDG compliance and drift-checking against canonical loader sources.
Changes:
- Expanded CI workflow path coverage to include
lib/zsh/**andtests/**, added new installer/sync-init test fixtures, and updated/pinned Actions usage across workflows. - Refactored bootstrap/installer scripts (
lib/sh/*,lib/zsh/init.zsh) to prefer XDG paths, add checksum-based verification, and simplify deprecated installer variants. - Repository maintenance cleanup: removed obsolete workflows and cspell wordlists; adjusted docs, trunk config, and ignore rules.
Reviewed changes
Copilot reviewed 30 out of 32 changed files in this pull request and generated 11 comments.
Show a summary per file
| File | Description |
|---|---|
tests/installers.sh |
New cross-platform installer + sync-init fixture tests (POSIX sh). |
scripts/sync-labels.sh |
New org-maintenance script to apply a canonical GitHub label set. |
scripts/repos.txt |
Repo list consumed by the new org-maintenance scripts. |
scripts/add-project-workflow.sh |
New org-maintenance script to add a project-tracker workflow across repos. |
lib/zsh/snippets/revolver |
Fixes and hardening around PID handling / process checks. |
lib/zsh/snippets/color.zsh |
Shebang ordering cleanup. |
lib/zsh/init.zsh |
Loader bootstrap modernization (XDG defaults, cleaner helpers). |
lib/sh/sync-init.sh |
New checksum-validated drift checker/sync tool for lib/zsh/init.zsh. |
lib/sh/install.sh |
Installer refactor (XDG defaults, loader fetch changes, zpmod delegation). |
lib/sh/install_zpmod.sh |
Refactor for stricter mode, better version checking, and XDG-aware defaults. |
lib/sh/install_alpha.sh |
Removed deprecated installer variant. |
lib/sh/i.sh |
Removed deprecated installer variant. |
lib/checksum.txt |
Updated checksums and added entries for new/changed scripts. |
docs/README.md |
Updated repo references and documented sync-init.sh usage. |
.vscode/settings.json |
Removed workspace-specific editor settings. |
.trunk/trunk.yaml |
Updated trunk versions/plugins, repo name, and added shfmt formatter definition. |
.gitignore |
Added ignores for agent/instructions markdown files. |
.github/workflows/wrangler.yml |
Removed deprecated/unused deployment workflow. |
.github/workflows/win-install.yml |
Expanded path triggers, updated actions, added installer fixtures run + XDG cleanup. |
.github/workflows/stale-action.yml |
Removed stale bot workflow. |
.github/workflows/rebase-action.yml |
Removed comment-driven rebase workflow. |
.github/workflows/rclone-action.yml |
Updated repo name guard, permissions, actions pins, and triggers. |
.github/workflows/deploy-gh-pages.yml |
Updated actions pins, permissions, repo guard, and commit message handling. |
.github/workflows/checksum.yml |
Narrowed trigger paths, added sync-init checksum coverage, updated pins/permissions. |
.github/workflows/check-macos.yml |
Expanded path triggers, updated pins, and added installer fixtures run. |
.github/workflows/check-linux.yml |
Expanded path triggers, updated pins, and added sync-init drift check step. |
.github/.cspell/project-words.txt |
Removed obsolete cspell wordlist. |
.github/.cspell/project-usernames.txt |
Removed obsolete cspell usernames list. |
.github/.cspell/project-ignored.txt |
Removed obsolete cspell ignored words list. |
.geminiignore |
Added/updated ignore file (content not shown in diff). |
.editorconfig |
Removed/replaced with simplified configuration (file removed in diff). |
.cspell/project-words.txt |
Removed obsolete cspell wordlist. |
Comments suppressed due to low confidence (1)
lib/sh/install.sh:49
sed -iis not portable across GNU/BSD sed (macOS requires-i ''). This will likely fail in the macOS workflow when-a loaderis used.
# shellcheck disable=SC2016
command sed -i 's|: ${ZI\[STREAM\]:="main"}|: ${ZI[STREAM]:="'"${BOPT}"'"}|' "${ZI_CONFIG_DIR}/init.zsh"
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
|
@copilot resolve the merge conflicts in this pull request |
Deploying src with
|
| Latest commit: |
d85cfd0
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://993cfbdd.zi-src.pages.dev |
| Branch Preview URL: | https://next.zi-src.pages.dev |
Resolved all merge conflicts in commits The conflicts arose because
Resolved all merge conflicts — see my reply below for details. |
- Fix mktemp -d portability: add template to all calls for BSD/macOS compat (tests/installers.sh, public/sh/install.sh, install_zpmod.sh, sync-init.sh, scripts/add-project-workflow.sh) - Fix add-project-workflow.sh: fail fast if mktemp fails - Fix _comps[zi] in public/zsh/init.zsh to register function name _zi instead of absolute file path (fixes completion loading) - Fix ANSI escape sequences in public/sh/sync-init.sh: use printf '%b' with real ESC prefix so color codes render correctly - Fix merged comment with duplicated # in public/zsh/snippets/revolver
* chore: remove deprecated files and configs Remove obsolete cspell word lists, editorconfig, vscode settings, and retired workflows (rebase, stale, sync-labels, wrangler). Drop legacy installer scripts i.sh and install_alpha.sh. * ci: update workflows and trunk configuration - Bump actions/checkout to v6.0.2 and shellcheck to 2.0.0 - Add lib/zsh/** and tests/** to push/PR path triggers - Add permissions: contents: read and timeout-minutes: 10 - Use github.ref in concurrency group - Replace ~/.zi hard-coded paths with XDG_DATA_HOME equivalents - Add unit-fixture step calling tests/installers.sh - Remove wrangler deploy job; update trunk linter config * feat: add sync-init.sh and tests/installers.sh sync-init.sh verifies (and optionally replaces) the local lib/zsh/init.zsh against the canonical GitHub raw main copy. Supports --write, --local, --remote, --checksum-url and --no-checksum flags. tests/installers.sh provides a POSIX sh test suite covering: - script syntax validation (sh -n / zsh -n) - checksum integrity checks - loader install with XDG path and branch-override assertions - standalone zpmod delegation test - sync-init fixture round-trip test * refactor: migrate installer scripts to XDG paths and harden POSIX install.sh: - Add set -eu; use WORKDIR=$(mktemp -d) with safe trap cleanup - Replace ~/.zi with XDG_DATA_HOME-aware path - Fix sed command for ZI[STREAM] substitution - Correct cd fallback from return to exit 1 - Guard branch pull with BOPT; add exit 1 on failed clone - Fix .zshrc loader snippet variable quoting install_zpmod.sh: - Add set -eu, file header and WORKDIR trap - Add pure-POSIX _zi_ver_ge() replacing expr string comparison - Honour XDG_DATA_HOME for ZI_HOME default - Replace exit 255 with exit 1 throughout lib/zsh/init.zsh: - Update default branch to use ZI[STREAM] parameter - Align loader paths with XDG layout * chore: update gitignore, checksums, and docs - Exclude AI agent instruction files from git tracking (AGENTS.md, CLAUDE.md, GEMINI.md, .github/copilot-instructions.md) - Add .geminiignore - Regenerate lib/checksum.txt to reflect updated scripts - Document sync-init.sh usage in docs/README.md - Remove deprecated git.io short URLs from README * Checksum e470ca3 * ci: add org project tracker scripts (#158) * ci(check-linux): add init.zsh sync-drift detection step * fix(install.sh): verify zi.zsh exists after clone, not just directory * ci: add concurrency to checksum.yml; add smoke-test to win-install.yml Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat: add color.zsh from molovo/color (MIT) * feat: add revolver from molovo/revolver (MIT) * chore: rename repo references from zi-src to src Update all internal references to reflect the repository rename: - .trunk/trunk.yaml repo name - workflow repository guards (checksum, rclone-action, deploy-gh-pages) - win-install safe.directory path - docs/README.md VSCode and jsDelivr URLs * ci: add org project tracker scripts (label sync + workflow rollout) * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Signed-off-by: Sall <59910950+ss-o@users.noreply.github.com> * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Signed-off-by: Sall <59910950+ss-o@users.noreply.github.com> * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Signed-off-by: Sall <59910950+ss-o@users.noreply.github.com> * fix: address review feedback for revolver process check and installer URLs Agent-Logs-Url: https://github.com/z-shell/src/sessions/3295a818-69b9-4b0d-99f8-bf27b90e3b7c Co-authored-by: ss-o <59910950+ss-o@users.noreply.github.com> * fix: validate revolver pid before liveness check Agent-Logs-Url: https://github.com/z-shell/src/sessions/3295a818-69b9-4b0d-99f8-bf27b90e3b7c Co-authored-by: ss-o <59910950+ss-o@users.noreply.github.com> --------- Signed-off-by: Sall <59910950+ss-o@users.noreply.github.com> * chore(ci): remove emoji prefixes from workflow names * build(deps): bump the github-actions group across 1 directory with 5 updates (#173) Bumps the github-actions group with 5 updates in the / directory: | Package | From | To | | --- | --- | --- | | [actions/checkout](https://github.com/actions/checkout) | `6.0.2` | `7.0.1` | | [z-shell/.github/actions/commit](https://github.com/z-shell/.github) | `1.0.8` | `1.1.1` | | [peaceiris/actions-gh-pages](https://github.com/peaceiris/actions-gh-pages) | `4.0.0` | `4.1.0` | | [z-shell/.github/actions/rclone](https://github.com/z-shell/.github) | `1.0.8` | `1.1.1` | | [egor-tensin/setup-cygwin](https://github.com/egor-tensin/setup-cygwin) | `4.0.1` | `4.0.2` | Updates `actions/checkout` from 6.0.2 to 7.0.1 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@de0fac2...3d3c42e) Updates `z-shell/.github/actions/commit` from 1.0.8 to 1.1.1 - [Release notes](https://github.com/z-shell/.github/releases) - [Commits](z-shell/.github@91068ee...3222f53) Updates `peaceiris/actions-gh-pages` from 4.0.0 to 4.1.0 - [Release notes](https://github.com/peaceiris/actions-gh-pages/releases) - [Changelog](https://github.com/peaceiris/actions-gh-pages/blob/main/CHANGELOG.md) - [Commits](peaceiris/actions-gh-pages@4f9cc66...84c30a8) Updates `z-shell/.github/actions/rclone` from 1.0.8 to 1.1.1 - [Release notes](https://github.com/z-shell/.github/releases) - [Commits](z-shell/.github@91068ee...3222f53) Updates `egor-tensin/setup-cygwin` from 4.0.1 to 4.0.2 - [Release notes](https://github.com/egor-tensin/setup-cygwin/releases) - [Changelog](https://github.com/egor-tensin/setup-cygwin/blob/master/CHANGELOG.md) - [Commits](egor-tensin/setup-cygwin@d2c752b...fca9069) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: 7.0.1 dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions - dependency-name: z-shell/.github/actions/commit dependency-version: 1.1.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions - dependency-name: peaceiris/actions-gh-pages dependency-version: 4.1.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions - dependency-name: z-shell/.github/actions/rclone dependency-version: 1.1.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions - dependency-name: egor-tensin/setup-cygwin dependency-version: 4.0.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fix: resolve merge conflicts with origin/main * fix: address code review issues from PR review - Fix mktemp -d portability: add template to all calls for BSD/macOS compat (tests/installers.sh, public/sh/install.sh, install_zpmod.sh, sync-init.sh, scripts/add-project-workflow.sh) - Fix add-project-workflow.sh: fail fast if mktemp fails - Fix _comps[zi] in public/zsh/init.zsh to register function name _zi instead of absolute file path (fixes completion loading) - Fix ANSI escape sequences in public/sh/sync-init.sh: use printf '%b' with real ESC prefix so color codes render correctly - Fix merged comment with duplicated # in public/zsh/snippets/revolver * fix: add completion dir to fpath in _zi_comps before registering _zi * revert: remove fpath manipulation from _zi_comps, defer to zi.zsh * chore: remove deprecated scripts/ directory * fix: update checksums to match current script files --------- Signed-off-by: Sall <59910950+ss-o@users.noreply.github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Salvydas Lukosius <ss-o@users.noreply.github.com> Co-authored-by: digital-teams[bot] <actions@zshell.dev> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> 47f0510
This pull request primarily updates GitHub Actions workflows and shell scripts for improved consistency, reliability, and user experience. The most important changes include updating the
actions/checkoutdependency to the latest version across all workflows, standardizing workflow names, improving error message formatting in shell scripts, and fixing minor issues in Zsh snippet scripts.CI/CD Workflow Updates:
actions/checkoutto version 7.0.1 in all GitHub Actions workflow files for improved security and compatibility. [1] [2] [3] [4] [5] [6] [7] [8] [9]Shell Script Improvements:
sync-init.shto use proper escape sequences for colored output, ensuring messages display as intended. [1] [2] [3] [4] [5] [6] [7] [8]Zsh Snippet Fixes:
_zi_compsto correctly register thezicompletion function without requiring a file, improving completion reliability.revolverspinner snippet, preventing orphaned processes and handling errors gracefully. [1] [2]revolverusage message ("an demo" → "a demo").Repository Maintenance:
scripts/repos.txtfile, possibly as part of deprecating or relocating repository management.