Skip to content

6.4 Merge to Master Pull Request#10891

Merged
ofahimIQSS merged 833 commits intomasterfrom
develop
Sep 30, 2024
Merged

6.4 Merge to Master Pull Request#10891
ofahimIQSS merged 833 commits intomasterfrom
develop

Conversation

@ofahimIQSS
Copy link
Copy Markdown
Contributor

No description provided.

poikilotherm and others added 30 commits August 30, 2024 16:11
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.
Instead of repeating the same steps everywhere, use a common action under our version control.
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.
* 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)
…ges-qa

a proposed refinement (simplification) of some of the "main" language names in the new list
pdurbin and others added 15 commits September 27, 2024 09:43
…on metadata block (#10884)

* Changed: displayOnCreate set to true for depositor and dateOfDeposit in citation.tsv

* Changed: MetadataBlocksIT test assertion for new total number of displayOnCreate fields

* Added: release notes for #10850

* Added: minor tweak to 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)
@ofahimIQSS ofahimIQSS added this to the 6.4 milestone Sep 27, 2024
@github-actions

This comment has been minimized.

Trailing comma in author name causes error
@cmbz cmbz added the FY25 Sprint 7 FY25 Sprint 7 (2024-09-25 - 2024-10-09) label Sep 30, 2024
@github-actions

This comment has been minimized.

1 similar comment
@github-actions

This comment has been minimized.

@github-actions

This comment has been minimized.

@github-actions

This comment has been minimized.

1 similar comment
@github-actions
Copy link
Copy Markdown

📦 Pushed preview images as

ghcr.io/gdcc/dataverse:develop
ghcr.io/gdcc/configbaker:develop

🚢 See on GHCR. Use by referencing with full name as printed above, mind the registry name.

@ofahimIQSS
Copy link
Copy Markdown
Contributor Author

Reviewed all jobs - merging

@ofahimIQSS ofahimIQSS merged commit 906f874 into master Sep 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

FY25 Sprint 7 FY25 Sprint 7 (2024-09-25 - 2024-10-09)

Projects

None yet

Development

Successfully merging this pull request may close these issues.