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

5.48 #22914

Merged
merged 6 commits into from
Mar 9, 2022
Merged

5.48 #22914

merged 6 commits into from
Mar 9, 2022

Conversation

demeritcowboy
Copy link
Contributor

Overview

Not sure what to do with civicrm_generated - this may fail tests, but we could regen in master after.

@seamuslee001 @colemanw

@civibot
Copy link

civibot bot commented Mar 9, 2022

(Standard links)

@civibot civibot bot added the master label Mar 9, 2022
@demeritcowboy
Copy link
Contributor Author

Going to merge but then will redo regen because civicrm_generated does have 5.48 in it.

@demeritcowboy demeritcowboy merged commit 817edc3 into master Mar 9, 2022
@colemanw
Copy link
Member

colemanw commented Mar 9, 2022

Probably no rush on that, there's still 3 weeks till master becomes 5.49 @demeritcowboy and forward-merges are easier this way.

@demeritcowboy
Copy link
Contributor Author

Except won't PR tests be using some 5.48 data instead of the latest-greatest until it's re-regen'd?

@colemanw
Copy link
Member

colemanw commented Mar 9, 2022

I dunno release management is more @totten's area.

@demeritcowboy
Copy link
Contributor Author

Or for people making local dev sites from master with sample data their installed version will appear to be 5.48 at first.

@totten
Copy link
Member

totten commented Mar 9, 2022

Yeah, if 5.48 rebuilt civicrm_generated.mysql and you merge-forward the change (eg civicrm_navigation.tpl), then it's best to regen on master as well.

Merged the corresponding PR for master's civicrm_generated.mysql.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants