Skip to content

Commit

Permalink
Merge pull request #57 from ss-o/main
Browse files Browse the repository at this point in the history
Post test fix/adds
  • Loading branch information
ss-o authored Dec 7, 2021
2 parents f3e1aa0 + 70c804c commit 7655ee5
Show file tree
Hide file tree
Showing 20 changed files with 768 additions and 2,413 deletions.
21 changes: 18 additions & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,27 @@
root = true

[*]
indent_style = space
indent_size = 2
charset = utf-8
end_of_line = lf
trim_trailing_whitespace = true
insert_final_newline = true

[**.{md,rst}]
trim_trailing_whitespace = false

[*.{yml,yaml}]
indent_style = space
tab_width = 2

[*.{sh,bash,zsh,fish}]
indent_style = space
tab_width = 2
trim_trailing_whitespace = true

[*.{js,jsx,html,sass}]
indent_style = tab
indent_size = 4
trim_trailing_whitespace = true

[ChangeLog]
indent_style = tab
indent_size = 8
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: CodeQL
name: 👾 CodeQL

on:
# push:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lock.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
name: Lock closed issues and PRs
name: 🔒 Lock closed issues and PRs

on:
schedule:
- cron: "0 9 * * *"
- cron: "30 2 * * *"
workflow_dispatch:

jobs:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/pr-labels.yml
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
---
name: Verify PR Labels
name: 🏷️ Verify PR Labels

on:
workflow_dispatch:
pull_request_target:
types: ['opened', 'labeled', 'unlabeled', 'synchronize' ]
types: [ 'opened', 'labeled', 'unlabeled', 'synchronize' ]

jobs:
pr_labels:
name: 🏭 Verify PR Labels
runs-on: ubuntu-latest
steps:
- name: Update and get pip cache dir
- name: 📥 Update and get pip cache dir
id: pip-cache
run: |
python -m pip install --upgrade pip
echo "::set-output name=dir::$(pip cache dir)"
- name: Restore pip cache
- name: 📤 Restore pip cache
uses: actions/cache@v2
with:
path: ${{ steps.pip-cache.outputs.dir }}
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-
- name: 🏷 Verify PR has a valid label
uses: jesusvasquez333/verify-pr-label-action@v1.4.0
with:
Expand Down
19 changes: 19 additions & 0 deletions .github/workflows/rebase.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: 🧬 Automatic Rebase
on:
issue_comment:
types: [created]
jobs:
rebase:
name: Rebase
if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase')
runs-on: ubuntu-latest
steps:
- name: ☑️ Checkout the latest code
uses: actions/checkout@v2
with:
token: ${{ secrets.GITHUB_TOKEN }}
fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
- name: 🧬 Automatic Rebase
uses: cirrus-actions/rebase@1.4
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: Stale
name: 🧹 Stale

on:
schedule:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/sync-labels.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
---
name: Sync Labels
name: ♻️ Sync Labels

on:
schedule:
- cron: "20 2 * * 2"
push:
branches:
- main
Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/wiki.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,27 @@ name: 📖 Wiki CI

on:
push:
branches: wiki
branches: [ wiki ]
paths:
- 'docs/wiki/**'
- "docs/wiki/**"
workflow_dispatch:

jobs:
deploy-wiki:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: 🌟 Markdown lint
uses: nosborn/github-action-markdown-cli@master
with:
files: "docs/wiki/*.md"
config_file: "docs/lint/.markdownlint.json"
- uses: actions/checkout@v2
- name: 🌟 Markdown lint
uses: nosborn/github-action-markdown-cli@master
with:
files: "docs/wiki/*.md"
config_file: "docs/lint/.markdownlint.json"

- name: 📩 Add to wiki
uses: Andrew-Chen-Wang/github-wiki-action@v2
env:
WIKI_DIR: docs/wiki/
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GH_MAIL: ${{ secrets.GH_MAIL }}
GH_NAME: ${{ github.repository_owner }}
EXCLUDED_FILES: "docs/wiki/drafts"
- name: 📩 Add to wiki
uses: Andrew-Chen-Wang/github-wiki-action@v2
env:
WIKI_DIR: docs/wiki/
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GH_MAIL: ${{ secrets.GH_MAIL }}
GH_NAME: ${{ github.repository_owner }}
EXCLUDED_FILES: "docs/wiki/drafts"
5 changes: 3 additions & 2 deletions .github/workflows/zi-lint.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: ZI Lint
name: 🌟 ZI Lint

on:
workflow_dispatch:
pull_request_target:

jobs:
Expand All @@ -14,7 +15,7 @@ jobs:
- name: "✨ Set matrix output"
id: set-matrix
run: |
MATRIX="$(find . -type d -name 'doc' -prune -o -type f -iname '*.zsh' -print | jq -ncR '{"include": [{"file": inputs}]}')"
MATRIX="$(find . -type d -name 'doc' -prune -o -type f \( -iname '*.zsh' -o -iname '_zi' \) -print | jq -ncR '{"include": [{"file": inputs}]}')"
echo "MATRIX=${MATRIX}" >&2
echo "::set-output name=matrix::${MATRIX}"
lint:
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -189,3 +189,7 @@ zmodules/Test/*.tmp
/zmodules/cscope.out
/zmodules/stamp-h
/zmodules/autom4te.cache
NEWS.md
.gitignore
Untitled-1.sh
TEMP.md
8 changes: 4 additions & 4 deletions docs/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ Please note we have a [code of conduct](CODE_OF_CONDUCT.md), please follow it in
> **[?]**
> Useful information about Zsh.
- [Zsh Site](http://zsh.sourceforge.net/)
- [Zsh Site](http://zsh.sourceforge.net/)
- [Zsh FAQ](https://zsh.sourceforge.io/FAQ/)
- [Zsh Doc](https://zsh.sourceforge.io/Doc/)
>
- [Bash 2 Zsh](http://www.bash2zsh.com/)
- [Zsh tips](http://www.zzapper.co.uk/zshtips.html)
- [101 Powerful & Practical ZSH GLOBS](http://www.zzapper.co.uk/101ZshGlobs.php)
- [Practical differences between Bash ans Zsh](https://apple.stackexchange.com/questions/361870/what-are-the-practical-differences-between-bash-and-zsh/361957#361957)
>
>
- [zshdb - a gdb-like debugger for zsh](https://zshdb.readthedocs.io/en/latest/index.html)
- [Debian Bug report logs: Bugs in package zsh](https://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=zsh)
- [Debian Bug report logs: Bugs in package zsh](https://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=zsh)

## Development environment setup

Expand Down Expand Up @@ -48,7 +48,7 @@ Please note we have a [code of conduct](CODE_OF_CONDUCT.md), please follow it in
your extra branch(es).

> **[?]**
> Always write your commit messages in the present tense. Your commit message should describe what the commit, when applied, does to the code – not what you did to the code.
> Always write your commit messages in the present tense. Your commit message should describe what the commit, when applied, does to the code – not what you did to the code. ([examples](https://www.google.com/search?q=english+"present+tense+example"))
## Issues and feature requests

Expand Down
18 changes: 8 additions & 10 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ Nightly Release
- [Interactive install](#interactive-install)
- [Quick install](#quick-install)
- [Manual install](#manual-install)
- [Usage](#usage)
- [Documentation](#documentation)
- [Contributing](#contributing)
- [Authors & contributors](#authors--contributors)
Expand All @@ -47,6 +46,9 @@ Nightly Release

---

[![asciicast](https://asciinema.org/a/QcC3gmoOqIkMdPJ7J9v6hiWGf.svg)](https://asciinema.org/a/QcC3gmoOqIkMdPJ7J9v6hiWGf)


## Getting Started

### Prerequisites
Expand Down Expand Up @@ -96,13 +98,9 @@ autoload -Uz _zi
(( ${+_comps} )) && _comps[zi]=_zi
```

## Usage

All usage information available [**here**](https://github.com/z-shell/zi/wiki/Usage). If you know how we could improve it, please let us know. We highly appreciated any feedback.

## Documentation

All [documentation](https://github.com/z-shell/zi/wiki) can be viewed on our wiki pages.
All [documentation](https://github.com/z-shell/zi/wiki) can be viewed on our wiki pages. If you know how we could improve it, please let us know. We highly appreciated any feedback.

## Contributing

Expand All @@ -116,19 +114,19 @@ Further releases of ❮ ZI ❯ will have Visual Studio Code workspace pre-config

## Authors & contributors

The original setup of this repository is by [Z-Shell ❮ ZI ❯ Community](https://github.com/z-shell).
The original setup of this repository is by [Z-Shell ZI Community](https://github.com/z-shell).

For a full list of all authors and contributors, see [the contributors page](https://github.com/z-shell/zi/contributors).

## Project assistance

If you want to say **thank you** or/and support active development of Z-Shell ZI :
If you want to say **thank you** or/and support active development of Z-Shell ZI :

- Add a [GitHub Star](https://github.com/z-shell/zi) to the project.
- Tweet about the Z-Shell ❮ ZI ❯.
- Tweet about the ❮ ZI ❯.
- Write interesting articles about the project on [Dev.to](https://dev.to/), [Medium](https://medium.com/) or your personal blog.

Together, we can make Z-Shell ❮ ZI ❯ **better**!
Together, we can make Z-Shell ZI **better**!

## Security

Expand Down
Loading

0 comments on commit 7655ee5

Please sign in to comment.