olli/olli.puhakka.dev
Watch
1
0
Fork
You've already forked olli.puhakka.dev
 0
Code Issues 5 Pull requests Projects Releases Packages 2 Wiki Activity Actions

Fast-forward dev to main's merge commit #20

Merged
olli merged 1 commit from main into dev 2026-10-15 02:37:10 +03:00
Conversation 0 Commits 1 Files changed -
olli-agent commented 2026-10-15 02:36:18 +03:00
Collaborator
Copy link

PR #19 (dev → main) was merged with a merge commit instead of fast-forward, so main now points at 9976813, a commit that never ran on dev. release.yml's find-image job found no image for it and failed (run 40). The deployer won't run a missing image either, so production still serves 8b5db24.

9976813 has the same tree as dev's 9d50d10, and its second parent is 9d50d10, so dev can fast-forward to it. Merge this with "Fast-forward only". Then:

  1. CI on dev builds and pushes the image for 9976813, and staging runs it.
  2. Re-run the failed find-image job on main (run 40). It finds the image, and production deploys.

After that, dev and main point at the same commit again.

PR #19 (dev → main) was merged with a merge commit instead of fast-forward, so `main` now points at `9976813`, a commit that never ran on `dev`. `release.yml`'s find-image job found no image for it and failed (run 40). The deployer won't run a missing image either, so production still serves `8b5db24`. `9976813` has the same tree as dev's `9d50d10`, and its second parent is `9d50d10`, so `dev` can fast-forward to it. **Merge this with "Fast-forward only".** Then: 1. CI on `dev` builds and pushes the image for `9976813`, and staging runs it. 2. Re-run the failed find-image job on `main` (run 40). It finds the image, and production deploys. After that, `dev` and `main` point at the same commit again.
Merge pull request 'Glossary' (#19) from dev into main
All checks were successful
CI / lint (push) Successful in 4s
Details
CI / image (push) Successful in 3s
Details
CI / verify-staging (push) Successful in 57s
Details
Release / find-image (push) Successful in 1s
Details
Release / verify-production (push) Successful in 1s
Details
99768133e6 
Reviewed-on: #19
olli merged commit 99768133e6 into dev 2026-10-15 02:37:10 +03:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
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
olli/olli.puhakka.dev!20
No description provided.