Skip to content

[stable35] ci: compile on CI after merge to reduce conflicts and total CI time - #64436

Merged
susnux merged 3 commits into
stable35from
backport/60589/stable35
Sep 16, 2026
Merged

susnux merged 3 commits into
stable35from
backport/60589/stable35

Conversation

@backportbot

@backportbot backportbot Bot commented Sep 16, 2026

Copy link
Copy Markdown

Backport of PR #60589

One of the biggest CI problems we currently face are conflicts,
not within source code but in compiled assets.
So if you have 2 PRs targeting e.g. files then the assets will likely
conflict even if the source can be merged without problems.

This causes unnecessary CI time and developer frustration.

Another really bad example: Dependency updates.

So this solution is the currently lived soltion of the `text` app:
1. we add a CI check to forbid checking in compiled assets
2. we adjust the node workflow to no longer check for asset changes
3. we add a CI workflow to compile after merges.

For the corner case where a new PR is merged before the compilation has
finished this will abort the first compile and start a new one for the
current HEAD.
So this also reduces the repository size in cases of many quick merged
like during dependabot updates.

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
@backportbot
backportbot Bot requested a review from a team as a code owner September 16, 2026 18:51
@backportbot
backportbot Bot requested review from Altahrim, CarlSchwan, come-nc, salmart-dev, susnux and szaimen and removed request for a team and szaimen September 16, 2026 18:51
@backportbot backportbot Bot added this to the Nextcloud 35.0.1 milestone Sep 16, 2026
artonge and others added 2 commits September 16, 2026 20:52
Signed-off-by: Louis <louis@chmn.me>
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

@szaimen szaimen left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🐘

@susnux
susnux merged commit 7cdfc11 into stable35 Sep 16, 2026
157 of 159 checks passed
@susnux
susnux deleted the backport/60589/stable35 branch September 16, 2026 19:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants