Skip to content

Merge develop into master for 6.11#12502

Merged
pdurbin merged 775 commits into
masterfrom
develop
Jul 1, 2026
Merged

Merge develop into master for 6.11#12502
pdurbin merged 775 commits into
masterfrom
develop

Conversation

@pdurbin

@pdurbin pdurbin commented Jul 1, 2026

Copy link
Copy Markdown
Member

What this PR does / why we need it:

Which issue(s) this PR closes:

  • Closes #

Special notes for your reviewer:

Suggestions on how to test this:

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

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

Additional documentation:

ChengShi-1 and others added 30 commits May 21, 2026 13:10
…st-api

Get Guestbook list API: add param to return inherited guestbooks
Add fast-redeploy scripts for container-based development (#10156)
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Updated concurrency group name to include branch reference and removed .txt files from paths-ignore.
Removed .txt files from paths-ignore in workflow.
Temporarily disable unreliable integration test for retrieving data collections.
Removed force_run input from workflow dispatch.
Replace curl command with docker cp for SUSHI config file.
Replaced local file copy with curl command to fetch SUSHI config.
Added master branch to push and pull_request triggers.
Updated the method of placing the SUSHI config file in the container by copying it directly from the repository instead of using curl.
Updated the workflow to check for the existence of the source file before copying it to the container.
Replace file existence check and copy method with direct injection into container.
@pdurbin pdurbin requested a review from poikilotherm as a code owner July 1, 2026 17:36
@pdurbin pdurbin moved this to In Progress 💻 in IQSS Dataverse Project Jul 1, 2026
@pdurbin pdurbin self-assigned this Jul 1, 2026
@pdurbin pdurbin added this to the 6.11 milestone Jul 1, 2026
} catch (IllegalArgumentException iae) {
return error(Response.Status.BAD_REQUEST, iae.getMessage());
} catch (SettingsValidationException sve) {
return error(Response.Status.BAD_REQUEST, sve.getMessage());
public Response getMakeDataCountMetricCurrentMonth(@Context ContainerRequestContext crc, @PathParam("id") String idSupplied, @PathParam("metric") String metricSupplied, @QueryParam("country") String country) {
String nullCurrentMonth = null;
return getMakeDataCountMetric(idSupplied, metricSupplied, nullCurrentMonth, country);
return getMakeDataCountMetric(crc, idSupplied, metricSupplied, nullCurrentMonth, country);
GetDataverseAllowedStorageDriverCommand getAllowedStorageDriversCommand = new GetDataverseAllowedStorageDriverCommand(request, dv);
return ok(execCommand(getAllowedStorageDriversCommand));
} catch (WrappedResponse wr) {
return handleWrappedResponse(wr);
@github-actions

This comment has been minimized.

@cmbz cmbz added the FY26 Sprint 26 FY26 Sprint 26 (2026-06-17 - 2026-07-01) label Jul 1, 2026
@github-actions

github-actions Bot commented Jul 1, 2026

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.

@github-actions

github-actions Bot commented Jul 1, 2026

Copy link
Copy Markdown

Test Results

403 tests   388 ✅  37m 23s ⏱️
 55 suites   15 💤
 55 files      0 ❌

Results for commit 741c5da.

@pdurbin pdurbin merged commit dd1859d into master Jul 1, 2026
41 of 44 checks passed
@github-project-automation github-project-automation Bot moved this from In Progress 💻 to Merged 🚀 in IQSS Dataverse Project Jul 1, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

FY26 Sprint 26 FY26 Sprint 26 (2026-06-17 - 2026-07-01)

Projects

Status: Merged 🚀

Development

Successfully merging this pull request may close these issues.