chore: merge beta into main for 1.14.0 release - #211
Merged
Conversation
Update CHANGELOG.md
…not-deployed fix: clear error when triggering job on undeployed scheduled task
…requires-deployment fix: repair kill-instance scope action slug and add instance_id parameter
The wait_deployment_active loop already computes desired/launched/ready
every cycle but only printed them into the log line, so the platform had
no launched/healthy counts for k8s custom scopes (no instance meters, no
n/n chip subtitles — unlike SWM-managed scopes, which report them).
Each change in the counts now PATCHes the deployment with a partial
strategy_data body ({amount_instances_to_wait, launched_instances,
healthy_instances}) — the deployment strategies merge a partial body over
the current data server-side, so switched_traffic and friends are
untouched; this is the same contract the scope-workflow-manager uses.
Reporting is best-effort: a failed patch logs at debug and never fails
the deployment.
…unts feat(k8s): report instance counters onto the deployment during the wait
chore: release 1.14.0
sebasnallar
approved these changes
Aug 3, 2026
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
3 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.
Integra
betaenmainpara el release 1.14.0.Ambas ramas están protegidas contra push directo, así que el merge commit se
crea en esta rama intermedia y entra a
mainpor PR.Conflicto resuelto
Único archivo en conflicto:
CHANGELOG.md. La divergencia era artificial:mainteníac9b25bf chore(changelog): release 1.13.0, que agregó unplaceholder
## [Unreleased]vacío y nunca volvió abeta.betarenombró esa misma sección a## [1.14.0] - 2026-08-03.Ambos lados reescribieron la misma región debajo del header, de ahí el conflicto.
Los otros 2 commits que
maintenía ybetano eran merges ya contenidos enbeta.Resolución: se toma el
CHANGELOG.mddebetatal cual, descartando elplaceholder vacío. El árbol resultante es idéntico a
beta(git diff origin/beta HEADvacío). El placeholder
## [Unreleased]vuelve amainen cuantobetalo re-creecon la próxima entrada de changelog.
Conservar el placeholder en
mainhabría hecho que el próximobeta -> mainvolviera a conflictuar en el mismo punto, porque es justo donde se insertan todas
las entradas nuevas. Verificado simulando el merge siguiente con
git merge-tree.Al mergear
Usar "Create a merge commit", no squash. El squash le daría a
mainel árbolde
betapero sin su ancestría: el merge-base retrocedería y los próximos mergestendrían que reconciliar los 15 commits de nuevo.
Para que no se repita
mainno debería recibir commits con contenido propio — solo merge commits desdebeta. El bump de versión y el rename[Unreleased]->[X.Y.Z]van enbetaybajan por el merge, como hizo
e594ec6para 1.14.0.