@@ -8,11 +8,11 @@ const JULIA_DOCS_TMP = get(ENV, "JULIA_DOCS_TMP", "$(BUILDROOT)/tmp")
8
8
9
9
# download and extract binary for a given version, return path to executable
10
10
function download_release (v:: VersionNumber )
11
- x, y, z = v. major, v. minor, v . patch
11
+ x, y = v. major, v. minor
12
12
julia_exec = cd (BUILDROOT) do
13
- julia = " julia-$(x) . $(y) . $(z ) -linux-x86_64"
13
+ julia = " julia-$(v ) -linux-x86_64"
14
14
tarball = " $(julia) .tar.gz"
15
- sha256 = " julia-$(x) . $(y) . $(z ) .sha256"
15
+ sha256 = " julia-$(v ) .sha256"
16
16
run (` curl -vo $(tarball) -L https://julialang-s3.julialang.org/bin/linux/x64/$(x) .$(y) /$(tarball) ` )
17
17
run (` curl -vo $(sha256) -L https://julialang-s3.julialang.org/bin/checksums/$(sha256) ` )
18
18
run (pipeline (` grep $(tarball) $(sha256) ` , ` sha256sum -c` ))
@@ -69,14 +69,13 @@ function copydocs(file)
69
69
end
70
70
71
71
function build_release_pdf (v:: VersionNumber )
72
- x, y, z = v. major, v. minor, v. patch
73
- @info " building PDF for Julia v$(x) .$(y) .$(z) ."
72
+ @info " building PDF for Julia v$(v) ."
74
73
75
- file = " julia-$(x) . $(y) . $(z ) .pdf"
74
+ file = " julia-$(v ) .pdf"
76
75
77
76
# early return if file exists
78
77
if isfile (" $(JULIA_DOCS) /$(file) " )
79
- @info " PDF for Julia v$(x) . $(y) . $(z ) already exists, skipping."
78
+ @info " PDF for Julia v$(v ) already exists, skipping."
80
79
return
81
80
end
82
81
@@ -85,7 +84,7 @@ function build_release_pdf(v::VersionNumber)
85
84
julia_exec = download_release (v)
86
85
87
86
# checkout relevant tag and clean repo
88
- run (` git -C $(JULIA_SOURCE) checkout v$(x) . $(y) . $(z )` )
87
+ run (` git -C $(JULIA_SOURCE) checkout v$(v ) ` )
89
88
run (` git -C $(JULIA_SOURCE) clean -fdx` )
90
89
91
90
# invoke makedocs
@@ -121,12 +120,15 @@ function collect_versions()
121
120
# lines are in the form 'COMMITSHA\trefs/tags/TAG'
122
121
_, ref = split (line, ' \t ' )
123
122
_, _, tag = split (ref, ' /' )
124
- if occursin (r" ^v\d +\.\d +\.\d +$" , tag)
123
+ if occursin (r" ^v\d +\.\d +\.\d +(?:-rc \d +)? $" , tag)
125
124
# the version regex is not as general as Base.VERSION_REGEX -- we only build "pure"
126
125
# versions and exclude tags that are pre-releases or have build information.
127
126
v = VersionNumber (tag)
128
127
# pdf doc only possible for 1.1.0 and above
129
- v >= v " 1.1.0" && push! (versions, v)
128
+ # only build rc if > 1.7
129
+ if v >= v " 1.1.0" && (isempty (v. prerelease) || v > v " 1.7.0" )
130
+ push! (versions, v)
131
+ end
130
132
end
131
133
end
132
134
return versions
0 commit comments