Skip to content

Commit 8e6a2ae

Browse files
mortenpiKristofferC
authored andcommitted
Use correct version for master docs (#34260)
* Use correct version for master docs Ideally, it should have been updated in #34218. Fix #34259. * Update release checklist
1 parent 9b7ea2f commit 8e6a2ae

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

Makefile

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -123,15 +123,16 @@ release-candidate: release testall
123123
@echo 2. Update references to the julia version in the source directories, such as in README.md
124124
@echo 3. Bump VERSION
125125
@echo 4. Increase SOMAJOR and SOMINOR if needed.
126-
@echo 5. Create tag, push to github "\(git tag v\`cat VERSION\` && git push --tags\)" #"` # These comments deal with incompetent syntax highlighting rules
127-
@echo 6. Clean out old .tar.gz files living in deps/, "\`git clean -fdx\`" seems to work #"`
128-
@echo 7. Replace github release tarball with tarballs created from make light-source-dist and make full-source-dist
129-
@echo 8. Check that 'make && make install && make test' succeed with unpacked tarballs even without Internet access.
130-
@echo 9. Follow packaging instructions in DISTRIBUTING.md to create binary packages for all platforms
131-
@echo 10. Upload to AWS, update https://julialang.org/downloads and http://status.julialang.org/stable links
132-
@echo 11. Update checksums on AWS for tarball and packaged binaries
133-
@echo 12. Announce on mailing lists
134-
@echo 13. Change master to release-0.X in base/version.jl and base/version_git.sh as in 4cb1e20
126+
@echo 5. Update versions in deploydocs (at the end of doc/make.jl) if needed.
127+
@echo 6. Create tag, push to github "\(git tag v\`cat VERSION\` && git push --tags\)" #"` # These comments deal with incompetent syntax highlighting rules
128+
@echo 7. Clean out old .tar.gz files living in deps/, "\`git clean -fdx\`" seems to work #"`
129+
@echo 8. Replace github release tarball with tarballs created from make light-source-dist and make full-source-dist
130+
@echo 9. Check that 'make && make install && make test' succeed with unpacked tarballs even without Internet access.
131+
@echo 10. Follow packaging instructions in DISTRIBUTING.md to create binary packages for all platforms
132+
@echo 11. Upload to AWS, update https://julialang.org/downloads and http://status.julialang.org/stable links
133+
@echo 12. Update checksums on AWS for tarball and packaged binaries
134+
@echo 13. Announce on mailing lists
135+
@echo 14. Change master to release-0.X in base/version.jl and base/version_git.sh as in 4cb1e20
135136
@echo
136137

137138
$(build_man1dir)/julia.1: $(JULIAHOME)/doc/man/julia.1 | $(build_man1dir)

doc/make.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,6 @@ deploydocs(
209209
deploy_config = BuildBotConfig(),
210210
target = joinpath(buildroot, "doc", "_build", "html", "en"),
211211
dirname = "en",
212-
devurl = "v1.4-dev",
213-
versions = ["v#.#", "v1.4-dev" => "v1.4-dev"]
212+
devurl = "v1.5-dev",
213+
versions = ["v#.#", "v1.5-dev" => "v1.5-dev"]
214214
)

0 commit comments

Comments
 (0)