Skip to content

Commit 311a579

Browse files
author
José Valim
committed
Update release instructions
Signed-off-by: José Valim <[email protected]> Conflicts: Makefile
1 parent b4c75f9 commit 311a579

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
REBAR := rebar
2+
DOCS := v1.0
23
ELIXIRC := bin/elixirc --verbose --ignore-module-conflict
34
ERLC := erlc -I lib/elixir/include
45
ERL := erl -I lib/elixir/include -noshell -pa lib/elixir/ebin
@@ -146,8 +147,8 @@ release_zip: compile
146147

147148
release_docs: docs
148149
cd ../docs
149-
rm -rf ../docs/stable
150-
mv docs ../docs/stable
150+
rm -rf ../docs/$(DOCS)
151+
mv docs ../docs/$(DOCS)
151152

152153
# This task requires aws-cli to be installed and set up for access to s3.hex.pm
153154
# See: http://docs.aws.amazon.com/cli/latest/userguide/cli-chap-getting-set-up.html

RELEASE.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ This document simply outlines the release process:
1818

1919
7. Push master and the new tag
2020

21-
8. Release new docs with `make release_docs`, move docs to `docs/stable` and push them
21+
8. Release new docs with `make release_docs`, move docs to `docs/stable` if appropriate, and push
2222

2323
9. Release new zip with `make release_zip`, push `Precompiled.zip` to GitHub Releases
2424

@@ -28,15 +28,13 @@ This document simply outlines the release process:
2828

2929
## New vMAJOR.MINOR releases
3030

31-
11. Create a new branch "vMAJOR.MINOR" release
31+
11. Create a new branch "vMAJOR.MINOR"
3232

33-
12. Move stable docs to `docs/vOLD-MAJOR.OLD-MINOR`
33+
12. Move docs generation to `docs/vOLD-MAJOR.OLD-MINOR` and copy them to `docs/stable`
3434

35-
13. Move master docs to `docs/stable`
35+
13. Bump versions, start new CHANGELOG, add `-dev` back and commit "Start vVERSION+1"
3636

37-
14. Bump versions, start new CHANGELOG, add `-dev` back and commit "Start vVERSION+1"
38-
39-
15. `make release_docs` and push it to `elixir-lang/docs`
37+
14. `make release_docs` and push it to `elixir-lang/docs`
4038

4139
## Places where version is mentioned
4240

0 commit comments

Comments
 (0)