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

Fix version information when not related to a release #2351

Merged
merged 1 commit into from
Mar 18, 2022

Conversation

terhorstd
Copy link
Contributor

Revert accidental merge of last release (e396edb).

@terhorstd terhorstd added T: Bug Wrong statements in the code or documentation S: Critical Needs to be addressed immediately I: No breaking change Previously written code will work as before, no one should note anything changing (aside the fix) labels Mar 18, 2022
@terhorstd terhorstd requested a review from jougs March 18, 2022 13:16
@terhorstd terhorstd added this to To do in Build system and CI via automation Mar 18, 2022
@jougs jougs merged commit af48bd1 into nest:master Mar 18, 2022
Build system and CI automation moved this from To do to Done Mar 18, 2022
@terhorstd terhorstd deleted the fix_master_version_info branch March 18, 2022 13:16
@clinssen
Copy link
Contributor

Could you comment on how this commit affects #2116?

@jougs
Copy link
Contributor

jougs commented Mar 21, 2022

@terhorst: maybe we should rather put 3.4-pre in that field instead of UNKNOWN? @clinssen: would that help with #2116?

@clinssen
Copy link
Contributor

We could say, if we are based on a branch (if (NEST_VERSION_BRANCH)), then append a "hand-rolled" string to indicate the version it was based on. For instance,

if (NEST_VERSION_BRANCH)
    set(NEST_VERSION_BRANCH "${NEST_VERSION_BRANCH}@3.4-pre")
endif()

results in the version string

#define NEST_VERSION_STRING "master@3.4-pre@71c85a0f8"

Undoubtedly you and Dennis will have a better idea for syntax than my repeated at symbol. We are not presently compliant with https://peps.python.org/pep-0386/; how badly would we want this? An alternative, semantic versioning-compliant string would be

3.4-pre+71c85a0f8

or

3.4-pre+master-71c85a0f8

Updating the hand-rolled string would in any case need to be part of the steps involved in doing a release.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
I: No breaking change Previously written code will work as before, no one should note anything changing (aside the fix) S: Critical Needs to be addressed immediately T: Bug Wrong statements in the code or documentation
Projects
Development

Successfully merging this pull request may close these issues.

None yet

3 participants