Skip to content

Commit

Permalink
Merge pull request #51772 from Ch3LL/doc_conf_2019
Browse files Browse the repository at this point in the history
Update release versions for the 2019.2 branch
  • Loading branch information
Ch3LL authored Feb 25, 2019
2 parents 45425a4 + f28cc9b commit 27dd9fb
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -255,9 +255,9 @@ def inner(fn, *iargs, **ikwargs): # pylint: disable=unused-argument
project = 'Salt'

version = salt.version.__version__
latest_release = '2018.3.3' # latest release
previous_release = '2017.7.8' # latest release from previous branch
previous_release_dir = '2017.7' # path on web server for previous branch
latest_release = '2019.2.0' # latest release
previous_release = '2018.3.4' # latest release from previous branch
previous_release_dir = '2018.3' # path on web server for previous branch
next_release = '' # next release
next_release_dir = '' # path on web server for next release branch

Expand All @@ -268,11 +268,10 @@ def inner(fn, *iargs, **ikwargs): # pylint: disable=unused-argument
copyright = time.strftime("%Y")

# < --- START do not merge these settings to other branches START ---> #
build_type = 'develop' # latest, previous, develop, next
build_type = 'latest' # latest, previous, develop, next
release = latest_release
# < --- END do not merge these settings to other branches END ---> #

release = latest_release if build_type == 'develop' else version

# Set google custom search engine

if release == latest_release:
Expand Down

0 comments on commit 27dd9fb

Please sign in to comment.