diff options
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | CONTRIBUTING.md | 10 | ||||
| -rw-r--r-- | alacritty/Cargo.toml | 4 | ||||
| -rw-r--r-- | alacritty_terminal/Cargo.toml | 2 | ||||
| -rw-r--r-- | extra/alacritty.man | 2 | ||||
| -rw-r--r-- | extra/osx/Alacritty.app/Contents/Info.plist | 2 | ||||
| -rw-r--r-- | extra/windows/wix/alacritty.wxs | 2 |
7 files changed, 14 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index e61b6a89..fe2345ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,9 @@ The sections should follow the order `Packaging`, `Added`, `Changed`, `Fixed` an The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). -## 0.7.0-dev +## 0.8.0-dev + +## 0.7.0 ### Added diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3a2ecae8..068712dc 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -122,12 +122,12 @@ back into master. The exact steps for an exemplary `0.2.0` release might look like this: 1. Initially, the version on the latest master is `0.2.0-dev` 2. A new `v0.2.0` branch is created for the release - 3. On master, the version is bumped to `0.3.0-dev` + 3. In the branch, the version is bumped to `0.2.0-rc1` + 4. The new commit in the branch is tagged as `v0.2.0-rc1` + 5. A GitHub release is created for the `v0.2.0-rc1` tag + 6. The changelog since the last release (stable or RC) is added to the GitHub release description + 7. On master, the version is bumped to `0.3.0-dev` and the `-dev` suffix is removed from the `0.2.0-dev` changelog - 4. In the branch, the version is bumped to `0.2.0-rc1` - 5. The new commit in the branch is tagged as `v0.2.0-rc1` - 6. A GitHub release is created for the `v0.2.0-rc1` tag - 7. The changelog since the last release (stable or RC) is added to the GitHub release description 8. Bug fixes are cherry-picked from master into the branch and steps 4-7 are repeated until no major issues are found in the release candidates 9. In the branch, the version is bumped to `0.2.0` diff --git a/alacritty/Cargo.toml b/alacritty/Cargo.toml index 39a7e0cf..b1055f5c 100644 --- a/alacritty/Cargo.toml +++ b/alacritty/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "alacritty" -version = "0.7.0-dev" +version = "0.8.0-dev" authors = ["Christian Duerr <contact@christianduerr.com>", "Joe Wilm <joe@jwilm.com>"] license = "Apache-2.0" description = "A fast, cross-platform, OpenGL terminal emulator" @@ -10,7 +10,7 @@ edition = "2018" [dependencies.alacritty_terminal] path = "../alacritty_terminal" -version = "0.11.1-dev" +version = "0.12.1-dev" default-features = false [dependencies.alacritty_config_derive] diff --git a/alacritty_terminal/Cargo.toml b/alacritty_terminal/Cargo.toml index 40bf2667..ad2009cb 100644 --- a/alacritty_terminal/Cargo.toml +++ b/alacritty_terminal/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "alacritty_terminal" -version = "0.11.1-dev" +version = "0.12.1-dev" authors = ["Christian Duerr <contact@christianduerr.com>", "Joe Wilm <joe@jwilm.com>"] license = "Apache-2.0" description = "Library for writing terminal emulators" diff --git a/extra/alacritty.man b/extra/alacritty.man index 2d15c2f9..48b05de9 100644 --- a/extra/alacritty.man +++ b/extra/alacritty.man @@ -1,4 +1,4 @@ -.TH ALACRITTY "1" "August 2018" "alacritty 0.7.0-dev" "User Commands" +.TH ALACRITTY "1" "August 2018" "alacritty 0.8.0-dev" "User Commands" .SH NAME Alacritty \- A fast, cross-platform, OpenGL terminal emulator .SH "SYNOPSIS" diff --git a/extra/osx/Alacritty.app/Contents/Info.plist b/extra/osx/Alacritty.app/Contents/Info.plist index 19432c58..8c88e53b 100644 --- a/extra/osx/Alacritty.app/Contents/Info.plist +++ b/extra/osx/Alacritty.app/Contents/Info.plist @@ -15,7 +15,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>0.7.0-dev</string> + <string>0.8.0-dev</string> <key>CFBundleSupportedPlatforms</key> <array> <string>MacOSX</string> diff --git a/extra/windows/wix/alacritty.wxs b/extra/windows/wix/alacritty.wxs index 342e82b1..961faeb8 100644 --- a/extra/windows/wix/alacritty.wxs +++ b/extra/windows/wix/alacritty.wxs @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="windows-1252"?> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"> - <Product Name="Alacritty" Id="*" UpgradeCode="87c21c74-dbd5-4584-89d5-46d9cd0c40a7" Language="1033" Codepage="1252" Version="0.7.0-dev" Manufacturer="Alacritty"> + <Product Name="Alacritty" Id="*" UpgradeCode="87c21c74-dbd5-4584-89d5-46d9cd0c40a7" Language="1033" Codepage="1252" Version="0.8.0-dev" Manufacturer="Alacritty"> <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine"/> <MajorUpgrade AllowSameVersionUpgrades="yes" DowngradeErrorMessage="A newer version of [ProductName] is already installed."/> <Icon Id="AlacrittyIco" SourceFile=".\extra\windows\alacritty.ico"/> |