chore(release): sync main back into development - #737
Closed
github-actions[bot] wants to merge 13 commits into
Closed
chore(release): sync main back into development#737github-actions[bot] wants to merge 13 commits into
github-actions[bot] wants to merge 13 commits into
Conversation
Bumps the npm_and_yarn group with 1 update in the / directory: [webpack-dev-server](https://github.com/webpack/webpack-dev-server). Updates `webpack-dev-server` from 5.2.3 to 5.2.4 - [Release notes](https://github.com/webpack/webpack-dev-server/releases) - [Changelog](https://github.com/webpack/webpack-dev-server/blob/main/CHANGELOG.md) - [Commits](webpack/webpack-dev-server@v5.2.3...v5.2.4) --- updated-dependencies: - dependency-name: webpack-dev-server dependency-version: 5.2.4 dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] <support@github.com>
…chema customisations The repair step's loadConfiguration(force:true) caused seed data to be re-imported on every Nextcloud upgrade, silently overwriting operator- customised schema fields, properties, and permissions. force:true is intentional only on SettingsController::load() (manual admin reset). The repair step should seed only when not yet imported. Source: nextcloud-app-template C1 propagation sweep 2026-05-27
….3 to 5.2.4 in the npm_and_yarn group across 1 directory' (#1) from dependabot/npm_and_yarn/npm_and_yarn-b3b66759cf into main automerge: scholiq#1
…2 June 2026) + conduction.nl app link
- Add missing @nextcloud/webpack-vue-config peer deps (node-polyfill-webpack-plugin, babel-loader, @babel/core, @babel/preset-env, sass, sass-loader, ts-loader, webpack-dev-server) so the production webpack build runs under --legacy-peer-deps. - Add linkifyjs explicitly (peer of @nextcloud/vue's linkify-string, skipped by --legacy-peer-deps). - Regenerate package-lock.json over existing pins. - Fix reusable release workflow refs: ConductionNL -> Conduction org (renamed on Codeberg); the wrong org meant the Stable Release workflow never resolved, so no release-stable run was ever produced on main.
Inhoud exact Codeberg-main (tree ongewijzigd); banner-commit alleen als ancestor zodat de push fast-forward is. Migratie 16-07.
…uction' 404s) (#248) * ci: point the release workflows at ConductionNL/.github (the org 'Conduction' does not exist) `main` calls its two release reusable workflows from `Conduction/.github`. That GitHub org returns 404 — the rename went to `ConductionNL` — so Actions cannot resolve the ref and both *Beta Release* and *Stable Release* produce ZERO jobs and fail instantly on every push to `beta`/`main`. The tell is visible in `gh run list --json name`: an unresolved run reports the raw workflow PATH (`.github/workflows/release-stable.yml`) instead of the workflow's `name:` (`Stable Release`). Verified the targets exist upstream: gh api repos/ConductionNL/.github/contents/.github/workflows/release-beta.yml?ref=main gh api repos/ConductionNL/.github/contents/.github/workflows/release-stable.yml?ref=main `development` already carries the correct org on both files, so this only affects `main`. `.forgejo/workflows/` is deliberately untouched — on Codeberg the org really is `Conduction`. Delivered on a hotfix/* branch because the shared check-branch gate only accepts `beta -> main` or `hotfix/* -> main`. * ci: regenerate docs/features.json from openspec/specs/ [skip ci] --------- Co-authored-by: Conduction Release Bot <release-bot@conduction.nl> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Release: merge development into beta
main held 8 commit(s) beta did not. Merged with -s ours: beta's tree is kept BYTE FOR BYTE and only the ancestry is recorded, so the beta -> main promotion stops conflicting on files where beta is simply newer. Not brought over -- beta is hundreds of commits ahead of main, so these are the OLDER copies, and several are dead Forgejo/Codeberg CI that development deliberately removed: appinfo/info.xml docs/features.json lib/Repair/InitializeSettings.php package-lock.json package.json
The default branch is moving to `main` for every app in the fleet, and Dependabot reads its config from the DEFAULT branch only. main's copy here predates the `target-branch` addition, so the moment the default flips, every bump would be opened against `main` -- where branch-protection refuses it and it can never merge. That is not hypothetical. Measured 2026-08-30, before the config was fixed on the apps that already defaulted to main: 41 open pull requests across ten repositories, none of them mergeable, and Dependabot reopening them as fast as they were closed. This carries development's canonical config onto main so the flip is safe. 2 target-branch declarations, one per ecosystem.
Release: merge beta into main
The 0.2.4 release bumped the version on main. Without this, development stays behind main and the next development -> main promotion conflicts on the version file. Version files resolve to development's side, which is the higher line, so this never moves a version backwards.
Contributor
|
Superseded. fleet-back-merge.yml could not merge these while it waited for green on branches red for unrelated reasons, so one accumulated per run (107 open across the fleet). ConductionNL/.github#648 removed that wait, and the sweep that followed carried and merged the same ancestry immediately. This pull request changes zero files, so closing it loses nothing: the ancestry it recorded is already on the branch. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Opened by the release workflow after publishing 0.2.4 from
main.A release commits a version bump onto the branch it ran from. Without carrying
that back,
developmentfalls behindmain, and since both branches thenchanged the version file independently, the next
development -> mainpromotion conflicts on it — every time.
Version files are resolved to development's side, the higher line, so this
cannot move a version backwards. Any other conflict stops the workflow instead
of being resolved automatically.
Merge this, do not squash. A squash copies the files and discards the
relationship: the merge base would not move and the next promotion would
conflict exactly as before. A 0-file diff here is normal and is not a no-op —
recording the ancestry is the whole point.