Skip to content

Commit

Permalink
Merge branch 'prep-release'
Browse files Browse the repository at this point in the history
  • Loading branch information
agateau committed Jul 22, 2022
2 parents b018167 + 3140892 commit 295794b
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 12 deletions.
5 changes: 5 additions & 0 deletions .changes/0.2.2.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
## 0.2.2 - 2022-07-22

### Added

- Make it possible to configure protected branches, using `git config`. See `git-bonsai --help` for details.
4 changes: 0 additions & 4 deletions .changes/unreleased/Added-20220722-204135.yaml

This file was deleted.

38 changes: 33 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,37 @@
# Changelog
All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
and is generated by [Changie](https://github.com/miniscruff/changie).
## 0.2.2 - 2022-07-22

### Added

No releases yet, this file will be updated when generating your first release.
- Make it possible to configure protected branches, using `git config`. See `git-bonsai --help` for details.

# Changelog

## 0.2.1 - 2021-05-25

### Changed

- Internal: code is more Rust-like now (#4).
- Internal: CI now checks formatting and runs clippy linter.

### Fixed

- git-bonsai no longer fails when a branch is checked out in a separate worktree. Worktree branches are just ignored (#5).

## 0.2.0 - 2020-03-29

### Added

- Added a --no-fetch option.
- Implemented removal of identical branches.
- Added integration tests.
- The CI now builds git-bonsai on Windows and macOS.

### Changed

- Improved README.

## 0.1.0 - 2020-03-22

First release.
2 changes: 1 addition & 1 deletion Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "git-bonsai"
version = "0.2.2-alpha"
version = "0.2.2"
authors = ["Aurélien Gâteau <[email protected]>"]
edition = "2018"
description = "Command-line tool to clean the branches of your git garden"
Expand Down
2 changes: 1 addition & 1 deletion tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ def tag(c):

def get_artifact_list() -> List[Path]:
assert ARTIFACTS_DIR.exists()
return list(ARTIFACTS_DIR.glob("*.tar.gz")) + list(ARTIFACTS_DIR.glob("*.zip"))
return list(ARTIFACTS_DIR.glob("*.tar.bz2"))


@task
Expand Down

0 comments on commit 295794b

Please sign in to comment.