Skip to content

Commit

Permalink
Merge branch 'dandavison:main' into fix_ripgrep_trailing_newline
Browse files Browse the repository at this point in the history
  • Loading branch information
ippsav authored Nov 22, 2023
2 parents ff452e7 + b7fd05e commit d8a341a
Show file tree
Hide file tree
Showing 30 changed files with 881 additions and 223 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Continuous Integration
name: CI

on:
push:
Expand All @@ -7,7 +7,6 @@ on:
pull_request:

jobs:

unit_tests:
name: Unit tests
runs-on: ${{ matrix.job.os }}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/manual.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ name: Deploy Manual
on:
push:
branches:
- master
- main
paths:
- "manual/**"
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
10 changes: 10 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ unicode-segmentation = "1.10.1"
unicode-width = "0.1.10"
vte = "0.11.0"
xdg = "2.4.1"
clap_complete = "4.4.4"

[dependencies.git2]
version = "0.17.2"
Expand Down
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ end-to-end-test: build
./tests/test_deprecated_options > /dev/null
./tests/test_navigate_less_history_file

shell-completion:
for shell in bash fish zsh; do ./target/release/delta --generate-completion $$shell > etc/completion/completion.$$shell; done

release:
@make -f release.Makefile release

Expand Down Expand Up @@ -44,4 +47,4 @@ flamegraph: build
chronologer:
chronologer etc/performance/chronologer.yaml

.PHONY: build format lint test unit-test end-to-end-test release version hash benchmark flamegraph chronologer
.PHONY: build format lint test unit-test end-to-end-test release shell-completion version hash benchmark flamegraph chronologer
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<a href="https://github.com/dandavison/delta/actions">
<img src="https://github.com/dandavison/delta/workflows/Continuous%20Integration/badge.svg" alt="CI">
</a>
<a href="https://coveralls.io/github/dandavison/delta?branch=master">
<img src="https://coveralls.io/repos/github/dandavison/delta/badge.svg?branch=master" alt="Coverage Status">
<a href="https://coveralls.io/github/dandavison/delta?branch=main">
<img src="https://coveralls.io/repos/github/dandavison/delta/badge.svg?branch=main" alt="Coverage Status">
</a>
<a href="https://gitter.im/dandavison-delta/community?utm_source=badge&amp;utm_medium=badge&amp;utm_campaign=pr-badge">
<img src="https://badges.gitter.im/dandavison-delta/community.svg" alt="Gitter">
Expand Down
Loading

0 comments on commit d8a341a

Please sign in to comment.