6.4 Merge to Master Pull Request #10891
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
As long as we are developing the next version of Dataverse, we don't want the develop branch to fight the container images updated by the maintenance workflow for the past releases. To avoid this, we simply use the next release version for the base image we use during development. It requires updating a property during the release process twice, as we need to set the version to the "main" version property ($revision) once we aim for creating the tag. This way, when using the release tag in forks or other ways as a foundation, people end up with the right base image. After the tag is done, we need to prepare using the virtual next version within the develop branch again.
We will use a long tag with Payara and Java version in it during development. This way we auto-update images on dev's PCs on these breaking changes. For any releases, we will use short tags using only the version and the OS flavor. These rolling tags will be accompanied by the revisioned tags. These extend the base name with the suffix as before, but only for releases, not the development branch. As the development branch is a rolling target, immutable tags make little sense. This commit also adds the necessary backporting patches to older releases for the parent module to define the base.image.version as $revision, as described in the extended release process.
Instead of retrieving the base image name again in every step, add it to the environment as variable. In the same go, enforce the shorter tags for release branches and the full length ones for the development branch.
Little faster, little more portable.
…ditional revision tag
Instead of repeating the same steps everywhere, use a common action under our version control.
Testing here - might not yet work.
Reusable action to determine if a base image has more recent updates than the creation of the derived image.
Reusable action to determine if a base image has more recent updates than the creation of the derived image.
datacite_plus_relPubRelType
* This is the fix for the bug in its entirety. #10819 * Making dataset thumbnail auto-selection optional (but enabled by default) #10819 * release note for the PR. #10819 * added a size == 0 check to DatasetUtil.getThumbnail (copied from #10687) #10819 * Added instructions on how to fix the files and datasets affected by the bug to the release note. #10819 * 2 extra words added to the release note #10819 * droped TIF from the error message in the thumbnail widgets, since it's not supported. (#10819)
datacite_xml_improvements
…ges-qa a proposed refinement (simplification) of some of the "main" language names in the new list
…averse into 10853-6.4-release-notes
fixed formatting of the shell block in the upgrade instruction
(it had "9.4.1" in it; and we probably don't want to get it from the master branch either)
6.4 release notes
This comment has been minimized.
This comment has been minimized.
Trailing comma in author name causes error
This comment has been minimized.
This comment has been minimized.
1 similar comment
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
docs: update release notes from #10343
This comment has been minimized.
This comment has been minimized.
1 similar comment
|
📦 Pushed preview images as 🚢 See on GHCR. Use by referencing with full name as printed above, mind the registry name. |
|
Reviewed all jobs - merging |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.