Skip to content

Commit 8f7e5bd

Browse files
authored
Merge branch 'main' into feat/cmd.exe
2 parents 1d17390 + 1d64ae0 commit 8f7e5bd

34 files changed

+455
-685
lines changed

.deepsource.toml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,9 @@ version = 1
22

33
[[analyzers]]
44
name = "rust"
5-
enabled = true
5+
6+
[analyzers.meta]
7+
msrv = "stable"
8+
9+
[[analyzers]]
10+
name = "shell"

.github/CODE_OF_CONDUCT.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,23 @@ diverse, inclusive, and healthy community.
1717
Examples of behavior that contributes to a positive environment for our
1818
community include:
1919

20-
* Demonstrating empathy and kindness toward other people
21-
* Being respectful of differing opinions, viewpoints, and experiences
22-
* Giving and gracefully accepting constructive feedback
23-
* Accepting responsibility and apologizing to those affected by our mistakes,
20+
- Demonstrating empathy and kindness toward other people
21+
- Being respectful of differing opinions, viewpoints, and experiences
22+
- Giving and gracefully accepting constructive feedback
23+
- Accepting responsibility and apologizing to those affected by our mistakes,
2424
and learning from the experience
25-
* Focusing on what is best not just for us as individuals, but for the
25+
- Focusing on what is best not just for us as individuals, but for the
2626
overall community
2727

2828
Examples of unacceptable behavior include:
2929

30-
* The use of sexualized language or imagery, and sexual attention or
30+
- The use of sexualized language or imagery, and sexual attention or
3131
advances of any kind
32-
* Trolling, insulting or derogatory comments, and personal or political attacks
33-
* Public or private harassment
34-
* Publishing others' private information, such as a physical or email
32+
- Trolling, insulting or derogatory comments, and personal or political attacks
33+
- Public or private harassment
34+
- Publishing others' private information, such as a physical or email
3535
address, without their explicit permission
36-
* Other conduct which could reasonably be considered inappropriate in a
36+
- Other conduct which could reasonably be considered inappropriate in a
3737
professional setting
3838

3939
## Enforcement Responsibilities
@@ -106,7 +106,7 @@ Violating these terms may lead to a permanent ban.
106106
### 4. Permanent Ban
107107

108108
**Community Impact**: Demonstrating a pattern of violation of community
109-
standards, including sustained inappropriate behavior, harassment of an
109+
standards, including sustained inappropriate behavior, harassment of an
110110
individual, or aggression toward or disparagement of classes of individuals.
111111

112112
**Consequence**: A permanent ban from any sort of public interaction within

.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: github-actions
4+
directory: /
5+
schedule:
6+
interval: weekly

.github/workflows/ci.yml

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ env:
1010
CARGO_TERM_COLOR: always
1111
permissions:
1212
contents: read
13-
1413
jobs:
1514
ci:
1615
name: ${{ matrix.os }}
@@ -19,33 +18,37 @@ jobs:
1918
matrix:
2019
os: [ubuntu-latest, windows-latest]
2120
steps:
22-
- uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 # v2.6.0
21+
- uses: actions/checkout@v3
2322
with:
2423
fetch-depth: 0
25-
26-
- uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1.0.7
24+
- uses: actions-rs/toolchain@v1
2725
if: ${{ matrix.os == 'windows-latest' }}
2826
with:
27+
components: clippy
28+
profile: minimal
2929
toolchain: stable
30-
components: rustfmt, clippy
30+
- uses: actions-rs/toolchain@v1
31+
if: ${{ matrix.os == 'windows-latest' }}
32+
with:
33+
components: rustfmt
3134
profile: minimal
32-
override: true
33-
- uses: cachix/install-nix-action@d56f3ce9be45c562799280e8a561fbbe8f36de44 # v16
35+
toolchain: nightly
36+
- uses: cachix/install-nix-action@v21
3437
if: ${{ matrix.os != 'windows-latest' }}
3538
with:
3639
nix_path: nixpkgs=channel:nixos-unstable
37-
- uses: cachix/cachix-action@6a9a34cdd93d0ae4b4b59fd678660efb08109f2f # v12
40+
- uses: cachix/cachix-action@v12
3841
if: ${{ matrix.os != 'windows-latest' && env.CACHIX_AUTH_TOKEN != '' }}
3942
with:
4043
authToken: ${{ env.CACHIX_AUTH_TOKEN }}
4144
name: zoxide
42-
4345
- name: Setup cache
44-
uses: Swatinem/rust-cache@81d053bdb0871dcd3f10763c8cc60d0adc41762b # v1
46+
uses: Swatinem/rust-cache@v2.4.0
4547
with:
46-
key: ${{ matrix.target }}
47-
48-
- run: cargo xtask ci
49-
if: ${{ matrix.os == 'windows-latest' }}
50-
- run: nix-shell --cores 0 --pure --run 'rm -rf ~/.cargo/bin; cargo xtask ci'
51-
if: ${{ matrix.os != 'windows-latest' }}
48+
key: ${{ matrix.os }}
49+
- name: Install just
50+
uses: taiki-e/install-action@v2
51+
with:
52+
tool: just
53+
- name: Run lints + tests
54+
run: just lint test

.github/workflows/no-response.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ on:
44
types: [created]
55
schedule:
66
- cron: "0 0 * * *" # daily at 00:00
7-
permissions:
8-
issues: write
97
jobs:
108
no-response:
119
if: github.repository == 'ajeetdsouza/zoxide'
10+
permissions:
11+
issues: write
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: lee-dohm/no-response@9bb0a4b5e6a45046f00353d5de7d90fb8bd773bb # v0.5.0
14+
- uses: lee-dohm/[email protected]
1515
with:
1616
token: ${{ github.token }}
1717
daysUntilClose: 30
1818
responseRequiredLabel: waiting-for-response
1919
closeComment: >
20-
This issue has been automatically closed due to inactivity. If you
21-
feel this is still relevant, please comment here or create a fresh
22-
issue.
20+
This issue has been automatically closed due to inactivity. If you feel
21+
this is still relevant, please comment here or create a fresh issue.
22+

.github/workflows/release.yml

Lines changed: 21 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ env:
88
CARGO_INCREMENTAL: 0
99
permissions:
1010
contents: write
11-
1211
jobs:
1312
release:
1413
name: ${{ matrix.target }}
@@ -27,93 +26,79 @@ jobs:
2726
- os: ubuntu-latest
2827
target: aarch64-unknown-linux-musl
2928
deb: true
30-
3129
- os: macos-11
3230
target: x86_64-apple-darwin
3331
- os: macos-11
3432
target: aarch64-apple-darwin
35-
3633
- os: windows-latest
3734
target: x86_64-pc-windows-msvc
3835
- os: windows-latest
3936
target: aarch64-pc-windows-msvc
4037
steps:
4138
- name: Checkout repository
42-
uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 # v2.6.0
39+
uses: actions/checkout@v3
4340
with:
4441
fetch-depth: 0
45-
4642
- name: Get version
4743
id: get_version
48-
uses: SebRollen/toml-action@2bd04b06a3ebc3e6a3eb6060de115710cad16cd6 # v1.0.2
44+
uses: SebRollen/[email protected]
4945
with:
5046
file: Cargo.toml
5147
field: package.version
52-
5348
- name: Install Rust
54-
uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1.0.7
49+
uses: actions-rs/toolchain@v1
5550
with:
5651
toolchain: stable
5752
profile: minimal
5853
override: true
5954
target: ${{ matrix.target }}
60-
6155
- name: Setup cache
62-
uses: Swatinem/rust-cache@81d053bdb0871dcd3f10763c8cc60d0adc41762b # v1
56+
uses: Swatinem/rust-cache@v2.4.0
6357
with:
6458
key: ${{ matrix.target }}
65-
6659
- name: Build binary
67-
uses: actions-rs/cargo@844f36862e911db73fe0815f00a4a2602c279505 # v1.0.3
60+
uses: actions-rs/cargo@v1
6861
with:
6962
command: build
7063
args: --release --locked --target=${{ matrix.target }} --color=always --verbose
7164
use-cross: ${{ runner.os == 'Linux' }}
72-
7365
- name: Install cargo-deb
7466
if: ${{ matrix.deb == true }}
75-
uses: actions-rs/install@9da1d2adcfe5e7c16992e8242ca33a56b6d9b101 # v0.1.2
67+
uses: actions-rs/[email protected]
7668
with:
7769
crate: cargo-deb
78-
7970
- name: Build deb
8071
if: ${{ matrix.deb == true }}
81-
uses: actions-rs/cargo@844f36862e911db73fe0815f00a4a2602c279505 # v1.0.3
72+
uses: actions-rs/cargo@v1
8273
with:
8374
command: deb
8475
args: --no-build --no-strip --output=. --target=${{ matrix.target }}
85-
8676
- name: Package (*nix)
8777
if: runner.os != 'Windows'
88-
run: >
89-
tar -cv
90-
CHANGELOG.md LICENSE README.md
91-
man/
92-
-C contrib/ completions/ -C ../
93-
-C target/${{ matrix.target }}/release/ zoxide
94-
| gzip --best
95-
> 'zoxide-${{ steps.get_version.outputs.value }}-${{ matrix.target }}.tar.gz'
78+
run: |
79+
tar -cv CHANGELOG.md LICENSE README.md man/ \
80+
-C contrib/ completions/ -C ../ \
81+
-C target/${{ matrix.target }}/release/ zoxide |
82+
gzip --best > \
83+
zoxide-${{ steps.get_version.outputs.value }}-${{ matrix.target }}.tar.gz
9684
- name: Package (Windows)
9785
if: runner.os == 'Windows'
98-
run: >
99-
7z a 'zoxide-${{ steps.get_version.outputs.value }}-${{ matrix.target }}.zip'
100-
CHANGELOG.md LICENSE README.md
101-
./man/
102-
./contrib/completions/
103-
./target/${{ matrix.target }}/release/zoxide.exe
104-
86+
run: |
87+
7z a zoxide-${{ steps.get_version.outputs.value }}-${{ matrix.target }}.zip `
88+
CHANGELOG.md LICENSE README.md ./man/ ./contrib/completions/ `
89+
./target/${{ matrix.target }}/release/zoxide.exe
10590
- name: Upload artifact
106-
uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2 # v2.3.1
91+
uses: actions/upload-artifact@v3
10792
with:
10893
name: ${{ matrix.target }}
10994
path: |
11095
*.deb
11196
*.tar.gz
11297
*.zip
113-
11498
- name: Create release
115-
if: ${{ github.ref == 'refs/heads/main' && startsWith(github.event.head_commit.message, 'chore(release)') }}
116-
uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1
99+
if: |
100+
${{ github.ref == 'refs/heads/main' && startsWith(github.event.head_commit.message, 'chore(release)') }}
101+
uses: softprops/action-gh-release@v1
117102
with:
118103
draft: true
119104
files: |

.github/workflows/winget.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: winget
2+
on:
3+
release:
4+
types: [released]
5+
jobs:
6+
publish:
7+
runs-on: windows-latest
8+
steps:
9+
- uses: vedantmgoyal2009/winget-releaser@v2
10+
with:
11+
identifier: ajeetdsouza.zoxide
12+
installers-regex: '-pc-windows-msvc\.zip$'
13+
token: ${{ secrets.WINGET_TOKEN }}

CHANGELOG.md

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1313

1414
### Added
1515

16+
- Short option `-a` for `zoxide query --all`.
17+
18+
## [0.9.1] - 2023-05-07
19+
20+
### Added
21+
1622
- Fish/Zsh: aliases on `__zoxide_z` will now use completions.
1723
- Nushell: add support for v0.78.0.
1824
- Fish: plugin now works on older versions.
25+
- PowerShell: warn when PowerShell version is too old for `z -` and `z +`.
26+
- PowerShell: support for PWD hooks on all versions.
27+
28+
### Fixed
29+
30+
- Fish: not providing `cd` completions when there is a space in the path.
31+
- Bash/Fish/Zsh: providing `z` completions when the last argument starts with `z!`.
32+
- Bash/Fish/Zsh: attempting to `cd` when the last argument is `z!`.
1933

2034
## [0.9.0] - 2023-01-08
2135

@@ -32,7 +46,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3246
- Nushell: upgrade minimum supported version to v0.73.0.
3347
- Zsh: fix extra space in interactive completions when no match is found.
3448
- Fzf: various improvements, upgrade minimum supported version to v0.33.0.
35-
- Nushell: Accidental redefinition of hooks when initialized twice.
49+
- Nushell: accidental redefinition of hooks when initialized twice.
3650

3751
### Removed
3852

@@ -136,7 +150,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
136150

137151
### Fixed
138152

139-
- PowerShell: Hook not initializing correctly.
153+
- PowerShell: hook not initializing correctly.
140154

141155
## [0.7.6] - 2021-10-13
142156

@@ -434,6 +448,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
434448
- GitHub Actions pipeline to build and upload releases.
435449
- Support for zsh.
436450

451+
[0.9.1]: https://github.com/ajeetdsouza/zoxide/compare/v0.9.0...v0.9.1
437452
[0.9.0]: https://github.com/ajeetdsouza/zoxide/compare/v0.8.3...v0.9.0
438453
[0.8.3]: https://github.com/ajeetdsouza/zoxide/compare/v0.8.2...v0.8.3
439454
[0.8.2]: https://github.com/ajeetdsouza/zoxide/compare/v0.8.1...v0.8.2

0 commit comments

Comments
 (0)