diff --git a/Makefile b/Makefile index d11943d275..231c5e8fee 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ REBAR := rebar +DOCS := v1.0 ELIXIRC := bin/elixirc --verbose --ignore-module-conflict ERLC := erlc -I lib/elixir/include ERL := erl -I lib/elixir/include -noshell -pa lib/elixir/ebin @@ -146,8 +147,8 @@ release_zip: compile release_docs: docs cd ../docs - rm -rf ../docs/stable - mv docs ../docs/stable + rm -rf ../docs/$(DOCS) + mv docs ../docs/$(DOCS) # This task requires aws-cli to be installed and set up for access to s3.hex.pm # See: http://docs.aws.amazon.com/cli/latest/userguide/cli-chap-getting-set-up.html diff --git a/RELEASE.md b/RELEASE.md index 776db8fa4d..3f0ff8b754 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -18,7 +18,7 @@ This document simply outlines the release process: 7. Push master and the new tag -8. Release new docs with `make release_docs`, move docs to `docs/stable` and push them +8. Release new docs with `make release_docs`, move docs to `docs/stable` if appropriate, and push 9. Release new zip with `make release_zip`, push `Precompiled.zip` to GitHub Releases @@ -28,15 +28,13 @@ This document simply outlines the release process: ## New vMAJOR.MINOR releases -11. Create a new branch "vMAJOR.MINOR" release +11. Create a new branch "vMAJOR.MINOR" -12. Move stable docs to `docs/vOLD-MAJOR.OLD-MINOR` +12. Move docs generation to `docs/vOLD-MAJOR.OLD-MINOR` and copy them to `docs/stable` -13. Move master docs to `docs/stable` +13. Bump versions, start new CHANGELOG, add `-dev` back and commit "Start vVERSION+1" -14. Bump versions, start new CHANGELOG, add `-dev` back and commit "Start vVERSION+1" - -15. `make release_docs` and push it to `elixir-lang/docs` +14. `make release_docs` and push it to `elixir-lang/docs` ## Places where version is mentioned