Skip to content

chore: absorb main's history into beta so the promotion can merge - #438

Merged
rubenvdlinde merged 13 commits into
betafrom
chore/resolve-beta-main-promotion
Aug 29, 2026
Merged

chore: absorb main's history into beta so the promotion can merge#438
rubenvdlinde merged 13 commits into
betafrom
chore/resolve-beta-main-promotion

Conversation

@rubenvdlinde

@rubenvdlinde rubenvdlinde commented Aug 29, 2026

Copy link
Copy Markdown
Contributor

Unblocks #419 (beta → main), which is conflicted on 19 files.

This merges main into beta and resolves every conflict in beta's favour. That is not a preference — beta is strictly the newer side on each one:

file(s) beta main
appinfo/info.xml 1.1.0, NC max 34 0.1.2, NC max 33
css/tokens/*.css 2026-08-18 2026-05-26
token-sets.json 47 token sets 32
workflows shared reusable pipeline old inline php-checks

Both sides already carry the PHP 8.3 / NC 32 floors main raised in #249, so nothing from it is lost. The five workflows beta deleted stay deleted — they are the legacy DEPLOY_KEY ones main also set out to drop in #279. main's remaining unique commits are the Codeberg-era migration banner and token sync, which this fleet does not want, plus dependabot bumps beta passed long ago.

Proof rather than intent: the merged tree is byte-identical to origin/beta, and carries no .forgejo/ files.

Merged as a branch PR rather than pushed straight to beta, so the release branch keeps its protection.

rubenvdlinde and others added 13 commits March 5, 2026 11:23
@rubenvdlinde
Merge pull request #40 from ConductionNL/development
2b00f07 
chore: Merge development into main
@actions-user
Bump version to 0.1.2 [skip ci]
7d900d3
@dependabot
chore(deps): Bump the npm_and_yarn group across 1 directory with 13 u…
4eac570 
…pdates

Bumps the npm_and_yarn group with 3 updates in the /docusaurus directory: [brace-expansion](https://github.com/juliangruber/brace-expansion), [fast-uri](https://github.com/fastify/fast-uri) and [minimatch](https://github.com/isaacs/minimatch).


Updates `brace-expansion` from 1.1.12 to 1.1.14
- [Release notes](https://github.com/juliangruber/brace-expansion/releases)
- [Commits](juliangruber/brace-expansion@v1.1.12...v1.1.14)

Updates `fast-uri` from 3.1.0 to 3.1.2
- [Release notes](https://github.com/fastify/fast-uri/releases)
- [Commits](fastify/fast-uri@v3.1.0...v3.1.2)

Updates `minimatch` from 3.1.2 to 3.1.5
- [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md)
- [Commits](isaacs/minimatch@v3.1.2...v3.1.5)

Updates `picomatch` from 2.3.1 to 2.3.2
- [Release notes](https://github.com/micromatch/picomatch/releases)
- [Changelog](https://github.com/micromatch/picomatch/blob/master/CHANGELOG.md)
- [Commits](micromatch/picomatch@2.3.1...2.3.2)

Updates `postcss` from 8.5.6 to 8.5.15
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](postcss/postcss@8.5.6...8.5.15)

Updates `@babel/plugin-transform-modules-systemjs` from 7.29.0 to 7.29.4
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.29.4/packages/babel-plugin-transform-modules-systemjs)

Updates `dompurify` from 3.3.1 to 3.4.5
- [Release notes](https://github.com/cure53/DOMPurify/releases)
- [Commits](cure53/DOMPurify@3.3.1...3.4.5)

Updates `path-to-regexp` from 0.1.12 to 0.1.13
- [Release notes](https://github.com/pillarjs/path-to-regexp/releases)
- [Changelog](https://github.com/pillarjs/path-to-regexp/blob/v.0.1.13/History.md)
- [Commits](pillarjs/path-to-regexp@v0.1.12...v.0.1.13)

Updates `follow-redirects` from 1.15.11 to 1.16.0
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](follow-redirects/follow-redirects@v1.15.11...v1.16.0)

Updates `lodash` from 4.17.23 to 4.18.1
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](lodash/lodash@4.17.23...4.18.1)

Updates `mermaid` from 11.12.3 to 10.9.6
- [Release notes](https://github.com/mermaid-js/mermaid/releases)
- [Commits](https://github.com/mermaid-js/mermaid/compare/mermaid@11.12.3...v10.9.6)

Updates `svgo` from 3.3.2 to 3.3.3
- [Release notes](https://github.com/svg/svgo/releases)
- [Commits](svg/svgo@v3.3.2...v3.3.3)

Updates `webpack-dev-server` from 5.2.3 to 4.15.2
- [Release notes](https://github.com/webpack/webpack-dev-server/releases)
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/v4.15.2/CHANGELOG.md)
- [Commits](webpack/webpack-dev-server@v5.2.3...v4.15.2)

---
updated-dependencies:
- dependency-name: brace-expansion
  dependency-version: 1.1.14
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: fast-uri
  dependency-version: 3.1.2
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: minimatch
  dependency-version: 3.1.5
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: picomatch
  dependency-version: 2.3.2
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: postcss
  dependency-version: 8.5.15
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: "@babel/plugin-transform-modules-systemjs"
  dependency-version: 7.29.4
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: dompurify
  dependency-version: 3.4.5
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: path-to-regexp
  dependency-version: 0.1.13
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: follow-redirects
  dependency-version: 1.16.0
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: lodash
  dependency-version: 4.18.1
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: mermaid
  dependency-version: 10.9.6
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: svgo
  dependency-version: 3.3.3
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: webpack-dev-server
  dependency-version: 4.15.2
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
@github-actions
chore: sync NL Design System tokens from upstream
cb6c59d 
Auto-generated from nl-design-system/themes repository.
See: https://github.com/nl-design-system/themes
@rubenvdlinde
docs: add Codeberg migration banner
ac54a9a
rubenvdlinde
Merge pull request 'chore: Sync NL Design System tokens' (#2) from ch…
11f5741 
…ore/sync-nldesign-tokens into main

automerge: nldesign#2
rubenvdlinde
Merge pull request 'chore(deps): Bump the npm_and_yarn group across 1…
c2514b6 
… directory with 13 updates' (#1) from dependabot/npm_and_yarn/docusaurus/npm_and_yarn-071331d98c into main

automerge: nldesign#1
@MWest2020
chore: absorbeer GitHub-archiverings-banner-commit in de historie
ce08540 
Inhoud exact Codeberg-main (tree ongewijzigd); banner-commit alleen als
ancestor zodat de push fast-forward is. Migratie 16-07.
@rubenvdlinde
fix(ci): bound every job on main — including the nightly scheduled one (
bbe4d06 
#202)

* fix(ci): bound the nightly token-sync job on main

GitHub runs schedule: workflows from the DEFAULT branch only, so the copy
that fires nightly at 03:00 UTC is main's. Bounding it on development would
never reach the run that actually executes.

* fix(ci): bound the remaining 17 jobs on main

nldesign's main-branch workflows are not dead: this very PR triggered PHP
Lint, PHPCS, PHPMD, Psalm, PHPStan, PHPUnit, CSS Quality, Branch Policy
Check, check-branch and lint-check from them. Every one ran unbounded, so a
hang would have burned a runner for six hours.
@rubenvdlinde
fix(ci): raise the php-checks bound to 30 — one bound covers six matr…
66e7f42 
…ix legs (#203)

The job-level timeout has to clear the SLOWEST leg. Five legs are static
analysis at max 4 min, but the PHPUnit leg has been measured at 18.9 min
while SUCCEEDING elsewhere in the fleet. 20 min left that only ~6% of
headroom, which is how a timeout manufactures a phantom defect.
@rubenvdlinde
chore: raise Nextcloud floor to 32 and PHP floor to 8.3 (#249)
a58b92d
@rubenvdlinde @juanclaude-conduction
chore(ci): drop the eight legacy workflows that authenticate with the…
07a6353 
… dead DEPLOY_KEY (#279)

The SSH DEPLOY_KEY is revoked — 'git@github.com: Permission denied
(publickey)' on the Checkout Code step, 2026-08-08. It is a distinct dead
credential from PROJECT_TOKEN and needs its own rotation.

Deleted rather than rotated, because this generation is already superseded:
beta and development both carry only the current .yml set and none of these
files. main is the only branch still holding them, since a promotion adds
files without removing what it replaced. Nothing here has succeeded since
March 2026; release-beta.yaml has never run at all.

Note: main is left with no release workflow until the next beta -> main
promotion brings release-stable.yml. It currently has one that fails on
checkout, so nothing working is lost, but the gap is real.

Co-authored-by: Ruben van der Linde <juan.claude@conduction.nl>
Conduction Release Bot
Merge main into beta — beta supersedes main on every conflicting file
dec21e7 
Clears the 19 conflicts blocking the beta -> main promotion (#419). Each is
taken from beta, which is strictly the newer side on all of them:

  appinfo/info.xml   beta 1.1.0, NC max-version 34; main 0.1.2, max 33. Both
                     already carry the PHP 8.3 / NC 32 floors main raised in
                     #249, so nothing from it is lost.
  css/tokens/*.css   beta 2026-08-18, main 2026-05-26.
  token-sets.json    47 token sets on beta against 32 on main.
  workflows          beta runs the shared reusable pipeline; main still has
                     the old inline php-checks job. The five workflows beta
                     deleted stay deleted — the legacy DEPLOY_KEY ones main
                     also set out to drop (#279).

main's remaining unique commits are the Codeberg-era migration banner and
token sync, which this fleet does not want, and dependabot bumps beta passed
long ago. The merge contributes main's history, not its content.

Proof, not intent: the merged tree is byte-identical to origin/beta.
@rubenvdlinde
rubenvdlinde merged commit 03a5bd1 into beta Aug 29, 2026
29 of 30 checks passed
@rubenvdlinde
rubenvdlinde deleted the chore/resolve-beta-main-promotion branch August 29, 2026 10:07
@github-actions

github-actions Bot commented Aug 29, 2026

Copy link
Copy Markdown
Contributor

Quality Report — ConductionNL/thematiq @ 06df91b

Check PHP Vue Security License Tests
lint ✅
phpcs ✅
phpmd ✅
psalm ✅
phpstan ✅
phpmetrics ✅
eslint ✅
stylelint ✅
build ✅
check-manifest ✅
test-l10n ✅
format ✅
composer ✅ ✅ 104/104
npm ✅ ✅ 2/2
app:check-code ⏭️
info.xml ✅
REUSE ❌
PHPUnit ✅
Newman ✅
Playwright ✅
Hydra gates ✅

Quality workflow — 2026-08-29 10:40 UTC

Download the full PDF report from the workflow artifacts.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@rubenvdlinde @actions-user @MWest2020