Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update latest to 2.4 #616

Merged
merged 4 commits into from
Feb 20, 2024
Merged

Update latest to 2.4 #616

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
88f8f22
Update latest to 2.4
ywwg Feb 16, 2024
2dc2810
also update build_html
ywwg Feb 16, 2024
ed25ff5
lint
ywwg Feb 16, 2024
89a1cea
Mark 2.5 as unreleased, not 2.4
ywwg Feb 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build_html.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ NUM_LANGUAGES="$(printf '%s' "$LANGUAGES" | wc -w)"
# Write _redirects file
mkdir -p build/html
printf '/ /latest/ 302\n' > build/html/_redirects
printf '/latest/* /2.3/:splat 301\n' >> build/html/_redirects
printf '/latest/* /2.4/:splat 301\n' >> build/html/_redirects

i=1
for lang in $LANGUAGES
Expand All @@ -20,10 +20,10 @@ do

if [ "$lang" = "en" ]
then
printf '/:version/en/* /2.3/en/404.html 404\n' >> build/html/_redirects
printf '/:version/en/* /2.4/en/404.html 404\n' >> build/html/_redirects
printf '/:version/* /:version/en/:splat 301\n' >> build/html/_redirects
else
printf '/:version/%s/* /2.3/%s/404.html 404\n' "$lang" "$lang" >> build/html/_redirects
printf '/:version/%s/* /2.4/%s/404.html 404\n' "$lang" "$lang" >> build/html/_redirects
printf '/:version/* /:version/%s/:splat 301 Language=%s\n' "$lang" "$(printf "%s" "$lang" | sed 's/_/-/g')" >> build/html/_redirects
fi
make versionedhtml SPHINXOPTS="-j $(nproc) -Dlanguage=$lang"
Expand Down
2 changes: 1 addition & 1 deletion source/chapters/appendix/changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ Controller Backend
* Log warning if deprecated control is used `#11972 <https://github.com/mixxxdj/mixxx/pull/11972>`__
* ControlObject alias improvements `#11973 <https://github.com/mixxxdj/mixxx/pull/11973>`__
* Keyboard mapping: Repeat certain control actions if key is held `#12474 <https://github.com/mixxxdj/mixxx/pull/12474>`__
* Keyboard mapping: Return triggers doubleclick, move Preview functions to P / Shift+P `#12639 <https://github.com/mixxxdj/mixxx/pull/12639>`__
* Keyboard mapping: Return triggers double-click, move Preview functions to P / Shift+P `#12639 <https://github.com/mixxxdj/mixxx/pull/12639>`__
* Keyboard mapping: Various fixes `#12730 <https://github.com/mixxxdj/mixxx/pull/12730>`__
* Update keyboard sheet `#12578 <https://github.com/mixxxdj/mixxx/pull/12578>`__
* Logging: Add support for ``QT_MESSAGE_PATTERN`` environment variable
Expand Down
8 changes: 4 additions & 4 deletions source/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@

# General information about the project.
project = "Mixxx"
copyright = "2011-2021, The Mixxx Development Team"
copyright = "2011-2024, The Mixxx Development Team"

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
Expand Down Expand Up @@ -102,11 +102,11 @@
smv_tag_whitelist = r"^$"
smv_branch_whitelist = r"^(main|(\d+)\.(\d+))$"
smv_remote_whitelist = r"^origin$"
# Mark all branches in the form "N.M" as released except "2.4"
# Mark all branches in the form "N.M" as released except "2.5"
smv_released_pattern = r"^.*/(?!2\.4)(\d+)\.(\d+)$"
ywwg marked this conversation as resolved.
Show resolved Hide resolved
smv_latest_version = r"2.3"
smv_latest_version = r"2.4"
smv_outputdir_format = "{config.version}/{config.language}"
notfound_urls_prefix = "/2.3/en/"
notfound_urls_prefix = "/2.4/en/"

# Directories in which to search for additional message catalogs (see language),
# relative to the source directory. The directories on this path are searched
Expand Down
Loading