Jinemi/thermograph
4
0
Fork 0
Code Issues 2 Pull requests 3 Projects Releases Packages Wiki Activity Actions

promote: dev → main #83

Merged
admin_emi merged 1 commit from dev into main 2026-07-25 06:06:10 +00:00
Conversation 0 Commits 1 Files changed 52 +6671 -55
admin_emi commented 2026-07-25 04:16:23 +00:00
Owner
Copy link

Promotes dev → main, deploying to beta (beta.thermograph.org).

Divergence. 1 ahead, 17 behind. 1 commit(s) to carry, but the target has moved on by 17 — a merge commit is required and conflicts are possible

Predicted conflicts.

  • backend/web/app.py — edited on both sides

Commits (1).

  • a4ecb514 web/worker: add a process-level liveness heartbeat (#80)

Merge with a merge commit, not a squash or a fast-forward. main runs ahead of dev from earlier promotions, so --ff-only fails with "diverging branches", and squashing would rewrite the shared history so the next promotion sees every prior commit as new.

Promotes `dev` → `main`, deploying to beta (beta.thermograph.org). **Divergence.** 1 ahead, 17 behind. 1 commit(s) to carry, but the target has moved on by 17 — a merge commit is required and conflicts are possible **Predicted conflicts.** - `backend/web/app.py` — edited on both sides **Commits (1).** - a4ecb514 web/worker: add a process-level liveness heartbeat (#80) **Merge with a merge commit, not a squash or a fast-forward.** `main` runs ahead of `dev` from earlier promotions, so `--ff-only` fails with "diverging branches", and squashing would rewrite the shared history so the next promotion sees every prior commit as new.
admin_emi added 1 commit 2026-07-25 04:16:25 +00:00
web/worker: add a process-level liveness heartbeat (#80)
Some checks failed
secrets-guard / encrypted (push) Successful in 24s
Details
shell-lint / shellcheck (push) Successful in 26s
Details
Deploy frontend to LAN dev server / build (push) Successful in 2m11s
Details
Build + push frontend image (Forgejo registry) / build-push (push) Successful in 2m20s
Details
Build + push backend image (Forgejo registry) / build-push (push) Successful in 2m28s
Details
Deploy backend to LAN dev server / build (push) Successful in 2m45s
Details
PR build (required check) / changes (pull_request) Successful in 16s
Details
secrets-guard / encrypted (pull_request) Successful in 16s
Details
shell-lint / shellcheck (pull_request) Successful in 15s
Details
PR build (required check) / build-frontend (pull_request) Has been skipped
Details
PR build (required check) / validate-observability (pull_request) Has been skipped
Details
Deploy frontend to LAN dev server / deploy (push) Successful in 39s
Details
PR build (required check) / build-backend (pull_request) Successful in 1m21s
Details
PR build (required check) / gate (pull_request) Successful in 3s
Details
Deploy backend to LAN dev server / deploy (push) Failing after 2m31s
Details
a4ecb51401
admin_emi merged commit be88987d95 into main 2026-07-25 06:06:10 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
  
Compat/Breaking

Breaking change that won't be backward compatible

  
Kind/Bug

Something is not working

  
Kind/Documentation

Documentation changes

  
Kind/Enhancement

Improve existing functionality

  
Kind/Feature

New functionality

  
Kind/Security

This is security issue

  
Kind/Testing

Issue or pull request related to testing

  
Priority
Critical
The priority is critical

  
Priority
High
The priority is high

  
Priority
Low
The priority is low

  
Priority
Medium
The priority is medium

  
Reviewed
Confirmed
Issue has been confirmed

  
Reviewed
Duplicate
This issue or pull request already exists

  
Reviewed
Invalid
Invalid issue

  
Reviewed
Won't Fix
This issue won't be fixed

  
Status
Abandoned
Somebody has started to work on this but abandoned work

  
Status
Blocked
Something is blocking this issue or pull request

  
Status
Need More Info
Feedback is required to reproduce issue or to continue work

No labels
Compat/Breaking
Kind/Bug
Kind/Documentation
Kind/Enhancement
Kind/Feature
Kind/Security
Kind/Testing
Priority
Critical
Priority
High
Priority
Low
Priority
Medium
Reviewed
Confirmed
Reviewed
Duplicate
Reviewed
Invalid
Reviewed
Won't Fix
Status
Abandoned
Status
Blocked
Status
Need More Info
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
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: Jinemi/thermograph#83
No description provided.
Delete branch "dev"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?