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.

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

Allow overriding VERSION_STATUS with GODOT_VERSION_STATUS in env #51002

Merged
merged 1 commit into from
Jul 29, 2021

Conversation

akien-mga
Copy link
Member

@akien-mga akien-mga commented Jul 29, 2021

VERSION_STATUS is part of what constitutes the reference version for a given
Godot build, and is part of the version check for compatible export templates.

For dev snapshots (alpha, beta, RCs), we usually set the VERSION_STATUS to
a specific build number (e.g. beta2), but this change doesn't end up
committed to the Git repository as we don't want to keep changing version.py
for testing builds.

So this new environment override will be what can be used in official builds
and by users making custom builds for specific snapshots.


Together with #51001, this means that official builds can now be properly named
3.4.beta2.official.a71169c0e, and users have a guarantee that this build did
use a71169c without any custom changes. The only changes which make it special
are BUILD_NAME=official and GODOT_VERSION_STATUS=beta2, which users can
define themselves for custom builds (well, please don't use BUILD_NAME=official
for custom builds as it defeats its purpose ;)).

On the other hand, it means that the tarballs we distribute do not include e.g.
beta2 in version.py, and users must set GODOT_VERSION_STATUS if they want
to build a custom beta2 from that tarball.

The "previous" workflow of directly editing version.py to set the values one
wants is still possible of course.

@akien-mga akien-mga added enhancement topic:buildsystem cherrypick:3.x Considered for cherry-picking into a future 3.x release cherrypick:3.3 labels Jul 29, 2021
@akien-mga akien-mga added this to the 4.0 milestone Jul 29, 2021
@akien-mga akien-mga requested a review from a team as a code owner July 29, 2021 09:28
`VERSION_STATUS` is part of what constitutes the reference version for a given
Godot build, and is part of the version check for compatible export templates.

For dev snapshots (alpha, beta, RCs), we usually set the `VERSION_STATUS` to
a specific build number (e.g. `beta2`), but this change doesn't end up
committed to the Git repository as we don't want to keep changing `version.py`
for testing builds.

So this new environment override will be what can be used in official builds
and by users making custom builds for specific snapshots.
@akien-mga akien-mga force-pushed the version-status-env-override branch from adbfb09 to 948dcb6 Compare July 29, 2021 09:48
@mrjustaguy
Copy link
Contributor

Godot 4 Builds should use GODOT_VERSION_STATUS=waiting4 instead of Alphas, Betas and RCs 😄

@akien-mga
Copy link
Member Author

Examples from a test build on the official buildsystem with this and #51001:

Godot Engine v4.0.dev1.official.c3f9f7c5a - https://godotengine.org

Screenshot_20210729_121842
Screenshot_20210729_122716
Screenshot_20210729_122737

akien-mga added a commit to godotengine/godot-build-scripts that referenced this pull request Jul 29, 2021
@akien-mga akien-mga merged commit 4a3430b into godotengine:master Jul 29, 2021
@akien-mga akien-mga deleted the version-status-env-override branch July 29, 2021 12:45
@akien-mga
Copy link
Member Author

Cherry-picked for 3.4.

@akien-mga akien-mga removed the cherrypick:3.x Considered for cherry-picking into a future 3.x release label Aug 3, 2021
@akien-mga
Copy link
Member Author

Cherry-picked for 3.3.3.

akien-mga added a commit to godotengine/godot-build-scripts that referenced this pull request Aug 3, 2021
Depends on godotengine/godot#51001 and
godotengine/godot#51002, see the PRs for details.

(cherry picked from commit f2e9922)
akien-mga added a commit to akien-mga/godot that referenced this pull request Aug 19, 2021
akien-mga added a commit to akien-mga/godot that referenced this pull request Sep 21, 2021
akien-mga added a commit to akien-mga/godot that referenced this pull request Sep 21, 2021
sairam4123 pushed a commit to sairam4123/godot that referenced this pull request Nov 10, 2021
lekoder pushed a commit to KoderaSoftwareUnlimited/godot that referenced this pull request Dec 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants