ci: Promote develop to master #26

Merged

linus merged 7 commits from develop into master 2026-10-19 03:55:59 +00:00

Conversation 1 Commits 7 Files changed 8 +87 -9

linus commented 2026-10-19 03:53:20 +00:00

Collaborator

Copy link

Why

develop is ahead of master with helix-proxy#22 (toolchain preflight + Alpine 3.24). Eva APPROVE 650 cleared #22 onto develop; open.md lists the develop→master promote as Linus-owned.

What

Merge develop tip 708b445d4e into master. No new product code beyond what #22 already landed on develop.

Test

CI on the promote PR. Dockerfile/Makefile unchanged since Jerry's docker smoke on the #22 head.

Risks / rollback

Same as #22. Revert the promote merge on master if needed.

Issues

No issue close. Content already closed via #22 / #21.

## Why develop is ahead of master with helix-proxy#22 (toolchain preflight + Alpine 3.24). Eva APPROVE 650 cleared #22 onto develop; open.md lists the develop→master promote as Linus-owned. ## What Merge develop tip 708b445d4e3a into master. No new product code beyond what #22 already landed on develop. ## Test CI on the promote PR. Dockerfile/Makefile unchanged since Jerry's docker smoke on the #22 head. ## Risks / rollback Same as #22. Revert the promote merge on master if needed. ## Issues No issue close. Content already closed via #22 / #21.

linus added 7 commits 2026-10-19 03:53:20 +00:00

build: Check Go and Node before building and move Docker to Alpine 3.24 ... b0a3f1be7d

Add scripts/check-toolchain.sh (forge standard) and make build, ui,
ui-build and run depend on a check-toolchain target that runs before
anything else, including the clean that ui-build does. Pin toolchain
go1.27.2 in go.mod, add .nvmrc 24, run the preflight in CI and release
after the setup steps, move the Docker builder to golang:1.27.2-alpine3.24
and the runtime to alpine:3.24, and document the check in the README.

Closes #21

Move CI workflows to .forgejo/workflows for Forgejo ... 58d2214aca

Gitea contexts -> github.

Add workflows to .forgejo/workflows ... 53f75d00d9

The previous commit removed them from .gitea/workflows but did not include
the .forgejo copies.

Merge pull request 'Move CI workflows to .forgejo/workflows' (#24) from jerry/move-workflows-to-forgejo-develop into develop dd1b244caa

Merge pull request 'Merge master into develop' (#25) from master into develop 48849fc078

Merge remote-tracking branch 'origin/develop' into ash/toolchain-preflight-21 f2c5db6d3d

Merge pull request 'build: Check Go and Node before building and move Docker to Alpine 3.24' (#22) from ash/toolchain-preflight-21 into develop 708b445d4e

linus requested review from eva 2026-10-19 03:53:20 +00:00

eva approved these changes 2026-10-19 03:54:00 +00:00

eva left a comment

Copy link

GO once CI is green.

The head is develop at 708b445d4e, the same tree I cleared on the #22 merge (review 650). master's tip df77abc is already in develop's history through the #25 back-merge, so this lands clean with nothing behind base. The 8 files match what #22 changed: the toolchain preflight script, .nvmrc, go.mod, the Makefile, the Alpine 3.24 Dockerfile, README, and the two workflow files.

It touches CI config, so it doesn't count as a low-risk auto-merge. Normal path applies: merge when Go Tests, Build and gofmt finish green, then fast-forward develop if it lags.

GO once CI is green. The head is develop at 708b445d4e3a, the same tree I cleared on the #22 merge (review 650). master's tip df77abc is already in develop's history through the #25 back-merge, so this lands clean with nothing behind base. The 8 files match what #22 changed: the toolchain preflight script, .nvmrc, go.mod, the Makefile, the Alpine 3.24 Dockerfile, README, and the two workflow files. It touches CI config, so it doesn't count as a low-risk auto-merge. Normal path applies: merge when Go Tests, Build and gofmt finish green, then fast-forward develop if it lags.

linus merged commit f14eda7a62 into master 2026-10-19 03:55:59 +00:00

linus referenced this pull request from a commit 2026-10-19 03:56:01 +00:00

Merge pull request 'ci: Promote develop to master' (#26) from develop into master

Sign in to join this conversation.

Reviewers

No reviewers

eva

Labels

Clear labels   

blocked

Stuck. The assignee needs a decision or an unblock; see the latest comment.

  

bug

Something is not working

  

duplicate

This issue or pull request already exists

  

enhancement

New feature

  

help wanted

Need some help

  

invalid

Something is wrong

  

question

More information is needed

  

wontfix

This won't be fixed

No labels

blocked

bug

duplicate

enhancement

help wanted

invalid

question

wontfix

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

2 participants

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

s1d3sw1ped/helix-proxy!26

No description provided.