Skip to content

Merge develop branch into master (GUI)#552

Merged
matsduf merged 27 commits into
masterfrom
develop
Jun 29, 2026
Merged

Merge develop branch into master (GUI)#552
matsduf merged 27 commits into
masterfrom
develop

Conversation

@matsduf

@matsduf matsduf commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

Purpose

This PR is step https://github.com/zonemaster/zonemaster/blob/develop/docs/internal/maintenance/ReleaseProcess-release.md#15-merge-develop-branch-into-master

How to test this PR

"No reviewer or approval is required for this update."

matsduf and others added 27 commits December 19, 2025 15:55
Merge pull request #527 from zonemaster/develop
Merge master branch into develop (zonemaster-gui)
S6 is now installed in zonemaster/backend image
Some cleanup and mode Docker related file to docker folder
Handle empty testcase values in results
in the next release we will introduce the 'gui' image
that containt only the frontend.
Renaming now to avoid conflict and misunderstood later.
Updates CI settings to make CI more efficient
Co-authored-by: Mats Dufberg <mats.dufberg@iis.se>
Add GUI artifact build to the CI
@matsduf matsduf added this to the v2026.1 milestone Jun 29, 2026
@matsduf matsduf added P-High Priority: Issue to be solved before other RC-None Release category: Not to be included in Changes file. labels Jun 29, 2026
@matsduf matsduf merged commit dc9f471 into master Jun 29, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

P-High Priority: Issue to be solved before other RC-None Release category: Not to be included in Changes file.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants