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

Use newer SC version on the develop branch #5566

Merged
merged 1 commit into from Jan 11, 2022

Conversation

dyfer
Copy link
Member

@dyfer dyfer commented Sep 5, 2021

Purpose and Motivation

As discussed in supercollider/rfcs#16, I'd like to propose that the builds from the develop branch indicate the "next" SC version, along with the appropriate suffix, like -prerelease or -preview. This change has been briefly discussed with @joshpar and @jrsurge during the dev meeting on 2021-09-05 and I'm open to further suggestions on this.

One expected side effect of this is that any future merges from the <release>/main branch into develop would need to resolve the conflict in SCVersion.txt (only once per version change though). The version on the develop brach should still stay as the "next" version.

Types of changes

  • New feature

To-do list

  • Code is tested
  • All tests are passing
  • Updated documentation - wiki
  • Update the build python script
  • This PR is ready for review

@dyfer
Copy link
Member Author

dyfer commented Oct 31, 2021

Another proposed suffix name is -develop. I'd be happy with that one as well.

@dyfer
Copy link
Member Author

dyfer commented Dec 4, 2021

At the dev meeting we opted for -dev suffix.

EDIT: I will updated the wiki docs once this is merged.

@dyfer
Copy link
Member Author

dyfer commented Dec 8, 2021

Since 3.12.2 is coming shortly, I'll wait for the release so that we don't have to fix the conflict this time.

@dyfer
Copy link
Member Author

dyfer commented Jan 11, 2022

ready for review!

@dyfer dyfer merged commit 7ab82a2 into supercollider:develop Jan 11, 2022
@dyfer
Copy link
Member Author

dyfer commented Jan 11, 2022

I've updated the wiki: https://github.com/supercollider/supercollider/wiki/git-workflow-and-guidelines#versioning please let me know if anything needs to be changed.

I'll submit a PR with the update to the python script soon.

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.

None yet

2 participants