From ec3fa2b33a84d196457c1bc424e22f28a8648c15 Mon Sep 17 00:00:00 2001 From: Christian Duerr Date: Tue, 19 Nov 2019 21:34:34 +0100 Subject: [PATCH] Bump master to 0.4.1-dev To make the release process a bit smoother and prevent a freeze of the master process while review candidates are out, this will put the master in a perpetual development state. This should make it clear to everyone that the official source for releases is always the tagged branch and make it possible to release new versions completely independently. Since versions are bumped after each release, this makes it so the release branches do not have to get merged back into the master branch to show the correct development version. --- .travis.yml | 1 - CHANGELOG.md | 4 +++- Cargo.lock | 6 +++--- alacritty/Cargo.toml | 2 +- alacritty_terminal/Cargo.toml | 2 +- extra/alacritty.man | 2 +- extra/linux/io.alacritty.Alacritty.appdata.xml | 2 +- extra/linux/redhat/alacritty.spec | 2 +- extra/linux/snap/snapcraft.yaml | 2 +- extra/osx/Alacritty.app/Contents/Info.plist | 2 +- extra/windows/wix/alacritty.wxs | 2 +- 11 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4232282..458edc9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,4 +63,3 @@ deploy: rust: stable condition: $CLIPPY != true repo: jwilm/alacritty - branch: master diff --git a/CHANGELOG.md b/CHANGELOG.md index 4596646..ad47249 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,9 @@ 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/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased] +## 0.4.1-dev + +## 0.4.0-dev ### Packaging diff --git a/Cargo.lock b/Cargo.lock index 8a2d132..41689d2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,9 +23,9 @@ dependencies = [ [[package]] name = "alacritty" -version = "0.3.3" +version = "0.4.1-dev" dependencies = [ - "alacritty_terminal 0.3.3", + "alacritty_terminal 0.4.1-dev", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -50,7 +50,7 @@ dependencies = [ [[package]] name = "alacritty_terminal" -version = "0.3.3" +version = "0.4.1-dev" dependencies = [ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/alacritty/Cargo.toml b/alacritty/Cargo.toml index b47ff29..c28f056 100644 --- a/alacritty/Cargo.toml +++ b/alacritty/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "alacritty" -version = "0.3.3" +version = "0.4.1-dev" authors = ["Joe Wilm "] license = "Apache-2.0" description = "GPU-accelerated terminal emulator" diff --git a/alacritty_terminal/Cargo.toml b/alacritty_terminal/Cargo.toml index d42295b..36efde9 100644 --- a/alacritty_terminal/Cargo.toml +++ b/alacritty_terminal/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "alacritty_terminal" -version = "0.3.3" +version = "0.4.1-dev" authors = ["Joe Wilm "] license = "Apache-2.0" build = "build.rs" diff --git a/extra/alacritty.man b/extra/alacritty.man index 5f3bf3c..76a8a94 100644 --- a/extra/alacritty.man +++ b/extra/alacritty.man @@ -1,4 +1,4 @@ -.TH ALACRITTY "1" "August 2018" "alacritty 0.3.3" "User Commands" +.TH ALACRITTY "1" "August 2018" "alacritty 0.4.1-dev" "User Commands" .SH NAME alacritty \- a cross-platform, gpu-accelerated terminal emulator .SH "SYNOPSIS" diff --git a/extra/linux/io.alacritty.Alacritty.appdata.xml b/extra/linux/io.alacritty.Alacritty.appdata.xml index a23d6bc..5c17d98 100644 --- a/extra/linux/io.alacritty.Alacritty.appdata.xml +++ b/extra/linux/io.alacritty.Alacritty.appdata.xml @@ -28,7 +28,7 @@ However, it does allow configuration of many aspects of the terminal.

https://github.com/jwilm/alacritty https://github.com/jwilm/alacritty/issues - + https://github.com/jwilm/alacritty/blob/master/CONTRIBUTING.md#contact Joe Wilm diff --git a/extra/linux/redhat/alacritty.spec b/extra/linux/redhat/alacritty.spec index 477644a..7926c0e 100644 --- a/extra/linux/redhat/alacritty.spec +++ b/extra/linux/redhat/alacritty.spec @@ -1,5 +1,5 @@ Name: alacritty -Version: 0.3.3 +Version: 0.4.1-dev Release: 1%{?dist} Summary: A cross-platform, GPU enhanced terminal emulator License: ASL 2.0 diff --git a/extra/linux/snap/snapcraft.yaml b/extra/linux/snap/snapcraft.yaml index 7498184..cf2485c 100644 --- a/extra/linux/snap/snapcraft.yaml +++ b/extra/linux/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: alacritty -version: '0.3.3' +version: '0.4.1-dev' summary: Modern, GPU accelerated terminal emulator description: | Alacritty is a terminal emulator with a strong focus on simplicity and diff --git a/extra/osx/Alacritty.app/Contents/Info.plist b/extra/osx/Alacritty.app/Contents/Info.plist index de74f78..2cb34f8 100644 --- a/extra/osx/Alacritty.app/Contents/Info.plist +++ b/extra/osx/Alacritty.app/Contents/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.3.3 + 0.4.1-dev CFBundleSupportedPlatforms MacOSX diff --git a/extra/windows/wix/alacritty.wxs b/extra/windows/wix/alacritty.wxs index 24ed129..e6e799d 100644 --- a/extra/windows/wix/alacritty.wxs +++ b/extra/windows/wix/alacritty.wxs @@ -2,7 +2,7 @@ - +