Skip to content

merge from 6.6-release-branch to master#11649

Merged
pdurbin merged 1447 commits intomasterfrom
6.6-release-branch
Jul 17, 2025
Merged

merge from 6.6-release-branch to master#11649
pdurbin merged 1447 commits intomasterfrom
6.6-release-branch

Conversation

@pdurbin
Copy link
Copy Markdown
Member

@pdurbin pdurbin commented Jul 17, 2025

What this PR does / why we need it:

We have force-pushed master back to v6.5 and are now (in this pull request), re-doing the v6.6 release. The complete plan can be found here: https://docs.google.com/document/d/1oit6LLDUWpNpV_uWveOMvdwDsaUey-74ehvzCZp1f3k/edit?usp=sharing

Which issue(s) this PR closes:

None.

Special notes for your reviewer:

Normally we merge develop to master but develop is way ahead of v6.6. In fact it's ready for the v6.7 release. So we're using this "6.6-release-branch" instead of "develop". The "6.6-release-branch" is branched from the latest commit we want in v6.6, which is this one: b106bd0

Suggestions on how to test this:

https://guides.dataverse.org/en/6.6/developers/making-releases.html says to wait for important tests to pass but Jenkins/Ansible has already been bumped to v6.7 so I'm sure it will fail.

Maybe we don't do any testing. Not sure. 🤷

pdurbin and others added 30 commits March 4, 2025 13:21
…xtVocabFix

IQSS/11242 ExternalIdentifier fix
…ate-field-option

Revert "10476 display on create field option"
@pdurbin pdurbin moved this to Ready for Review ⏩ in IQSS Dataverse Project Jul 17, 2025
@pdurbin pdurbin added this to the 6.6 milestone Jul 17, 2025
@pdurbin pdurbin merged commit c8fab55 into master Jul 17, 2025
39 of 44 checks passed
@github-project-automation github-project-automation Bot moved this from Ready for Review ⏩ to Merged 🚀 in IQSS Dataverse Project Jul 17, 2025
@pdurbin pdurbin deleted the 6.6-release-branch branch July 17, 2025 19:44
@pdurbin pdurbin moved this from Merged 🚀 to Done 🧹 in IQSS Dataverse Project Jul 22, 2025
@cmbz cmbz added the FY26 Sprint 4 FY26 Sprint 4 (2025-08-13 - 2025-08-27) label Aug 16, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

FY26 Sprint 4 FY26 Sprint 4 (2025-08-13 - 2025-08-27)

Projects

Status: Done 🧹

Development

Successfully merging this pull request may close these issues.

10 participants