Skip to content

Commit

Permalink
Pre-release commit storm
Browse files Browse the repository at this point in the history
Before the release, a lot of testing was done, including the ci/cd pipeline. Some of this could
only be done in the live environment, which lead to many small commits with bad descriptions

Also includes many small fixes in urls and textual changes. Most of it inside migrate.py
  • Loading branch information
adikhoff committed Oct 14, 2024
1 parent 3678e84 commit 5750fb7
Show file tree
Hide file tree
Showing 13 changed files with 142 additions and 88 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_offline_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Migrate to Redot
run: |
python migrate.py . _migrated False
python migrate.py . _migrated
- name: Sphinx - Build HTML
run: make SPHINXOPTS='--color -j 4' SPHINXSOURCEDIR='./_migrated' html
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Migrate to Redot
run: |
python migrate.py . _migrated True
python migrate.py . _migrated
# Use dummy builder to improve performance as we don't need the generated HTML in this workflow.
- name: Sphinx build
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/sync_class_ref.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ jobs:
runs-on: ubuntu-latest
env:
engine_rev: 'master'

permissions:
contents: write
pull-requests: write

steps:
- name: Checkout the documentation repository
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion _extensions/gdscript.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Lexer for GDScript.
:copyright: Copyright 2xxx by The Godot Engine Community
:copyright: Copyright 2xxx by the Redot community, modified from an original work by the G-dot Engine Community
:license: MIT.
modified by Daniel J. Ramirez <[email protected]> based on the original python.py pygment
Expand Down
2 changes: 1 addition & 1 deletion _extensions/godot_descriptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
Sphinx extension to automatically generate HTML meta description tags
for all pages. Also comes with some special support for Godot class docs.
:copyright: Copyright 2021 by The Godot Engine Community
:copyright: Copyright 2021 by the Redot community, modified from an original work by the G-dot Engine Community
:license: MIT.
based on the work of Takayuki Shimizukawa on OpenGraph support for Sphinx,
Expand Down
14 changes: 0 additions & 14 deletions _templates/versions.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,24 +34,10 @@
<dd><a href="{{ url }}">{{ slug }}</a></dd>
{% endfor %}
</dl>
<dl>
{# Translators: The phrase "Read the Docs" is not translated #}
<dt>{{ _('On Read the Docs') }}</dt>
<dd>
<a href="//{{ PRODUCTION_DOMAIN }}/projects/{{ slug }}">{{ _('Project Home') }}</a>
</dd>
<dd>
<a href="//{{ PRODUCTION_DOMAIN }}/projects/{{ slug }}/builds/">{{ _('Builds') }}</a>
</dd>
<dd>
<a href="//{{ PRODUCTION_DOMAIN }}/projects/{{ slug }}/downloads/">{{ _('Downloads') }}</a>
</dd>
</dl>

<hr>
<small>
<span>Hosted by <a href="https://readthedocs.org">Read the Docs</a></span>
<span> · </span>
<a href="https://docs.readthedocs.io/page/privacy-policy.html">Privacy Policy</a>
</small>

Expand Down
2 changes: 1 addition & 1 deletion about/complying_with_licenses.rst
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ This text reads as follows::

This game uses Godot Engine, available under the following license:

Copyright (c) 2014-present Godot Engine contributors.
Copyright (c) 2014-present the Redot community, modified from an original work by G-dot Engine contributors.
Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.

Permission is hereby granted, free of charge, to any person obtaining a copy
Expand Down
3 changes: 1 addition & 2 deletions about/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ is a great starting point.

In case you have trouble with one of the tutorials or your project,
you can find help on the various `Community channels <https://godotengine.org/community/>`_,
especially the Godot `Discord <https://discord.gg/bdcfAYM4W9>`_ community and
`Forum <https://forum.godotengine.org/>`_.
especially the Godot `Discord <https://discord.gg/bdcfAYM4W9>`_ community.

About Godot Engine
------------------
Expand Down
4 changes: 2 additions & 2 deletions conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@
# General information about the project
project = "Godot Engine"
copyright = (
"2014-present Juan Linietsky, Ariel Manzur and the Godot community (CC BY 3.0)"
"2024-present by the Redot community, modified from an original work by Juan Linietsky, Ariel Manzur and the G-dot community (CC BY 3.0)"
)
author = "Juan Linietsky, Ariel Manzur and the Godot community"
author = "the Redot community, modified from an original work by Juan Linietsky, Ariel Manzur and the G-dot community"

# Version info for the project, acts as replacement for |version| and |release|
# The short X.Y version
Expand Down
6 changes: 4 additions & 2 deletions contributing/development/code_style_guidelines.rst
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,8 @@ Example:
/* GODOT ENGINE */
/* https://godotengine.org */
/**************************************************************************/
/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
/* Copyright (c) 2014-present the Redot community, modified from an */
/* original work by G-dot Engine contributors (see AUTHORS.md). */
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
Expand Down Expand Up @@ -222,7 +223,8 @@ Example:
/* GODOT ENGINE */
/* https://godotengine.org */
/**************************************************************************/
/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
/* Copyright (c) 2014-present the Redot community, modified from an */
/* original work by Godot Engine contributors (see AUTHORS.md). */
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ like ``core/math/a_star_grid_2d.compat.inc`` in this case:
/* GODOT ENGINE */
/* https://godotengine.org */
/**************************************************************************/
/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
/* Copyright (c) 2014-present the Redot community, modified from an */
/* original work by G-dot Engine contributors (see AUTHORS.md). */
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
Expand Down
Binary file added favicon.ico
Binary file not shown.
Loading

0 comments on commit 5750fb7

Please sign in to comment.