mslot
/
alacritty
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Christian Duerr 2019-11-19 21:34:34 +01:00
parent 4b2be6d7b1
commit ec3fa2b33a
No known key found for this signature in database
GPG Key ID: 85CDAE3C164BA7B4
11 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -63,4 +63,3 @@ deploy:
rust: stable rust: stable
condition: $CLIPPY != true condition: $CLIPPY != true
repo: jwilm/alacritty repo: jwilm/alacritty
branch: master

4
CHANGELOG.md
View File

@ -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/), 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). 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 ### Packaging

6
Cargo.lock generated
View File

@ -23,9 +23,9 @@ dependencies = [
[[package]] [[package]]
name = "alacritty" name = "alacritty"
version = "0.3.3" version = "0.4.1-dev"
dependencies = [ 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)", "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)", "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)", "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -50,7 +50,7 @@ dependencies = [
[[package]] [[package]]
name = "alacritty_terminal" name = "alacritty_terminal"
version = "0.3.3" version = "0.4.1-dev"
dependencies = [ dependencies = [
"base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",

2
alacritty/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "alacritty" name = "alacritty"
version = "0.3.3" version = "0.4.1-dev"
authors = ["Joe Wilm <joe@jwilm.com>"] authors = ["Joe Wilm <joe@jwilm.com>"]
license = "Apache-2.0" license = "Apache-2.0"
description = "GPU-accelerated terminal emulator" description = "GPU-accelerated terminal emulator"

2
alacritty_terminal/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "alacritty_terminal" name = "alacritty_terminal"
version = "0.3.3" version = "0.4.1-dev"
authors = ["Joe Wilm <joe@jwilm.com>"] authors = ["Joe Wilm <joe@jwilm.com>"]
license = "Apache-2.0" license = "Apache-2.0"
build = "build.rs" build = "build.rs"

2
extra/alacritty.man
View File

@ -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 .SH NAME
alacritty \- a cross-platform, gpu-accelerated terminal emulator alacritty \- a cross-platform, gpu-accelerated terminal emulator
.SH "SYNOPSIS" .SH "SYNOPSIS"

2
extra/linux/io.alacritty.Alacritty.appdata.xml
View File

@ -28,7 +28,7 @@ However, it does allow configuration of many aspects of the terminal.</p>
<url type="homepage">https://github.com/jwilm/alacritty</url> <url type="homepage">https://github.com/jwilm/alacritty</url>
<url type="bugtracker">https://github.com/jwilm/alacritty/issues</url> <url type="bugtracker">https://github.com/jwilm/alacritty/issues</url>
<releases> <releases>
<release version="0.3.3" date="2019-06-16" unix_timestamp="1560694196"/> <release version="0.4.1-dev" date="2019-06-16" unix_timestamp="1560694196"/>
</releases> </releases>
<update_contact>https://github.com/jwilm/alacritty/blob/master/CONTRIBUTING.md#contact</update_contact> <update_contact>https://github.com/jwilm/alacritty/blob/master/CONTRIBUTING.md#contact</update_contact>
<developer_name>Joe Wilm</developer_name> <developer_name>Joe Wilm</developer_name>

2
extra/linux/redhat/alacritty.spec
View File

@ -1,5 +1,5 @@
Name: alacritty Name: alacritty
Version: 0.3.3 Version: 0.4.1-dev
Release: 1%{?dist} Release: 1%{?dist}
Summary: A cross-platform, GPU enhanced terminal emulator Summary: A cross-platform, GPU enhanced terminal emulator
License: ASL 2.0 License: ASL 2.0

2
extra/linux/snap/snapcraft.yaml
View File

@ -1,5 +1,5 @@
name: alacritty name: alacritty
version: '0.3.3' version: '0.4.1-dev'
summary: Modern, GPU accelerated terminal emulator summary: Modern, GPU accelerated terminal emulator
description: | description: |
Alacritty is a terminal emulator with a strong focus on simplicity and Alacritty is a terminal emulator with a strong focus on simplicity and

2
extra/osx/Alacritty.app/Contents/Info.plist
View File

@ -15,7 +15,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>0.3.3</string> <string>0.4.1-dev</string>
<key>CFBundleSupportedPlatforms</key> <key>CFBundleSupportedPlatforms</key>
<array> <array>
<string>MacOSX</string> <string>MacOSX</string>

2
extra/windows/wix/alacritty.wxs
View File

@ -2,7 +2,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"> xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<Product Name="Alacritty" Id="*" UpgradeCode="87c21c74-dbd5-4584-89d5-46d9cd0c40a7" Language="1033" Codepage="1252" Version="0.3.3" Manufacturer="Alacritty"> <Product Name="Alacritty" Id="*" UpgradeCode="87c21c74-dbd5-4584-89d5-46d9cd0c40a7" Language="1033" Codepage="1252" Version="0.4.1-dev" Manufacturer="Alacritty">
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine"/> <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine"/>
<MajorUpgrade AllowSameVersionUpgrades="yes" DowngradeErrorMessage="A newer version of [ProductName] is already installed."/> <MajorUpgrade AllowSameVersionUpgrades="yes" DowngradeErrorMessage="A newer version of [ProductName] is already installed."/>
<Icon Id="AlacrittyIco" SourceFile="..\extra\windows\alacritty.ico"/> <Icon Id="AlacrittyIco" SourceFile="..\extra\windows\alacritty.ico"/>