diff --git a/CHANGELOG.md b/CHANGELOG.md index a3e807eef25..fd7f2c2fee4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## v0.14.2-dev +## v0.14.2 * Enhancements * [Enum] Improve performance of `Enum.join/2` and `Enum.map_join/3` by using iolists @@ -13,7 +13,7 @@ * [URI] Allow `parse/1` now accepts `%URI{}` as argument and return the uri itself * Bug fixes - * [CLI] Support paths inside archives in -pa and -pz options + * [CLI] Support paths inside archives in `-pa` and `-pz` options * [IEx] Remove dely when printing data from the an application start callback * [IEx] Ensure we show a consistent error when we cannot evaluate `.iex.exs` * [Kernel] Ensure derived protocols are defined with a file diff --git a/RELEASE.md b/RELEASE.md index e74d7a4f497..965ace69e87 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -2,25 +2,27 @@ This document simply outlines the release process: -1) Remove `-dev` extension from VERSION +1. Remove `-dev` extension from VERSION -2) Ensure CHANGELOG is updated and timestamp +2. Ensure CHANGELOG is updated and timestamp -3) Commit changes above with title "Release vVERSION" and generate new tag +3. Commit changes above with title "Release vVERSION" and generate new tag -4) Run `make clean test` to ensure all tests pass from scratch and the CI is green +4. Run `make clean test` to ensure all tests pass from scratch and the CI is green -5) Push master and tags +5. Push master and tags -6) Release new docs with `make release_docs`, move docs to `docs/stable` +6. Release new docs with `make release_docs`, move docs to `docs/stable` -7) Release new zip with `make release_zip`, push new zip to GitHub Releases +7. Release new zip with `make release_zip`, push new zip to GitHub Releases -8) Merge master into stable branch and push it +8. Merge master into stable branch and push it -9) After release, bump versions, add `-dev` back and commit +9. After release, bump versions, add `-dev` back and commit -10) `make release_docs` once again and push it to `elixir-lang.github.com` +10. `make release_docs` once again and push it to `elixir-lang.org` + +11. Also update `release` file in `elixir-lang.org` ## Places where version is mentioned diff --git a/VERSION b/VERSION index 2161b773bdd..1c16bd1a419 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.14.2-dev \ No newline at end of file +0.14.2 \ No newline at end of file diff --git a/src/elixir.app.src b/src/elixir.app.src index 5d5ddf32a5a..ceebd6ef65e 100644 --- a/src/elixir.app.src +++ b/src/elixir.app.src @@ -1,6 +1,6 @@ {application, elixir, [{description, "elixir"}, - {vsn, "0.14.2-dev"}, + {vsn, "0.14.2"}, {modules, [ elixir ]},