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

8878 5.11.1 hotfix #8879

Merged
merged 14 commits into from Aug 2, 2022
Merged

8878 5.11.1 hotfix #8879

merged 14 commits into from Aug 2, 2022

Conversation

pdurbin
Copy link
Member

@pdurbin pdurbin commented Aug 1, 2022

What this PR does / why we need it:

We're working on hotfix release. See the included release notes doc.

I cherry picked commits from https://github.com/GlobalDataverseCommunityConsortium/dataverse/tree/v5.11.1-hotfix (thanks, @qqmyers !).

Which issue(s) this PR closes:

Special notes for your reviewer:

I'm not sure why those extra commits from @kcondon are in there. I branched from v5.11. This was before I fixed the pull request. Now it's properly targeting master instead of develop.

Also, I put in a PR today to describe how I think we should merge and handle hotfixes (#8877). You can preview it at https://dataverse-guide--8877.org.readthedocs.build/en/8877/developers/making-releases.html

I'm not usually the one to bump version numbers so some extra eyes here would be good.

The release notes are probably not final but I figure we can adjust them in the actual release on GitHub.

Suggestions on how to test this:

I believe we've tested these fixes already but I guess test them the same way?

Does this PR introduce a user interface change? If mockups are available, please link/include them here:

No.

Is there a release notes update needed for this change?:

Included.

Additional documentation:

None.

qqmyers and others added 10 commits August 1, 2022 16:58
and we don't want that in a check of the terms
FWIW: looking for the dataset.getThumbnailFile.getFileMetadata() in the filesToDelete list fails in the delete from a published version case (assuming getFileMetadata() doesn't return the dynamically created fmd for the new draft version)
@coveralls
Copy link

coveralls commented Aug 1, 2022

Coverage Status

Coverage decreased (-0.001%) to 19.709% when pulling 0f185b5 on 8878-5.11.1-hotfix into 21ac7e1 on master.

@pdurbin pdurbin changed the base branch from develop to master August 1, 2022 22:11
Copy link
Member

@qqmyers qqmyers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you're upgrading from v5.10.1, you should follow all of the v5.11 instructions (reexports, solr schema update, counter-processor notes, etc. - just don't need to deploy that war.) Should those instructions be added here? Or should the upgrade instructions reference v5.11? Maybe two upgrade choices - from v5.11 and from v5.10.1?

@pdurbin pdurbin added this to the 5.11.1 milestone Aug 2, 2022
@pdurbin
Copy link
Member Author

pdurbin commented Aug 2, 2022

@qqmyers I think it makes the most sense to adjust the 5.11 release notes to say to use the 5.11.1 war instead?

Add suggestion on detecting destroyed datasets.

Add milestone.
@landreev
Copy link
Contributor

landreev commented Aug 2, 2022

FWIW, I am absolutely in favor of removing 5.11 from the release page, and have this serve as a self-contained replacement release.

## Upgrade Instructions

0\. These instructions assume that you've already successfully upgraded from Dataverse Software 4.x to Dataverse Software 5 following the instructions in the [Dataverse Software 5 Release Notes](https://github.com/IQSS/dataverse/releases/tag/v5.0). After upgrading from the 4.x series to 5.0, you should progress through the other 5.x releases before attempting the upgrade to 5.11.1.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To upgrade from 5.10.1, follow the instructions for installing release 5.11 using the v5.11.1 war file. If you had previously installed v5.11 (no longer available), follow the simplified instructions below.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks great, I'll go ahead and add this. I will also add this sentence/some form thereof to the very top of the release note.

Added some bold-faced upgrade guidelines (using language suggested by @qqmyers and my own)
@kcondon kcondon self-assigned this Aug 2, 2022
@kcondon kcondon merged commit 02e3e92 into master Aug 2, 2022
IQSS/dataverse (TO BE RETIRED / DELETED in favor of project 34) automation moved this from QA ✅ to Done 🚀 Aug 2, 2022
@kcondon kcondon deleted the 8878-5.11.1-hotfix branch August 4, 2022 15:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
6 participants