ashwin/nxtgauge-gitops
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(gitops): reconcile GitHub and Forgejo histories after stalled sync
All checks were successful
sync-to-forgejo / sync (push) Successful in 15s
Details

Browse source 
GitHub->Forgejo sync (sync-to-forgejo.yml) had been failing since
2026-07-10 because it used a rebase-then-push strategy that assumed
Forgejo was always a fast-forward mirror of GitHub. FluxCD's own
ImageUpdateAutomation commits directly to Forgejo (the repo Flux's
GitRepository actually watches), so Forgejo had accumulated ~70
automated image-bump commits GitHub never saw, which made the rebase
fail. Meanwhile GitHub had a handful of manually/CI-pushed gitops
deploy commits Forgejo never received. This merge reconciles both
histories without discarding either side; both remotes fast-forward
to this commit.

# Conflicts:
#	apps/nxtgauge-admin-solid/overlays/prod/release-patch.yaml
#	apps/nxtgauge-frontend-solid/overlays/prod/release-patch.yaml
This commit is contained in:
sync-test 2026-07-13 19:35:05 +05:30
commit 5d4309314d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/nxtgauge-admin-solid/overlays/prod/release-patch.yaml
View file

@ -9,4 +9,4 @@ spec:
spec: spec:
containers: containers:
- name: admin-solid - name: admin-solid
image: ci.nxtgauge.com/ashwin/nxtgauge-admin-solid:high-performance-latest # {"$imagepolicy": "flux-system:nxtgauge-admin-solid"} image: ci.nxtgauge.com/ashwin/nxtgauge-admin-solid@sha256:e56570ac2a51346b251217875843ad77af71a0d549604454804e2346b8fb35a8

2
apps/nxtgauge-frontend-solid/overlays/prod/release-patch.yaml
View file

@ -9,4 +9,4 @@ spec:
spec: spec:
containers: containers:
- name: frontend-solid - name: frontend-solid
image: ci.nxtgauge.com/ashwin/nxtgauge-frontend-solid:sha-3d6a81d # {"$imagepolicy": "flux-system:nxtgauge-frontend-solid"} image: ci.nxtgauge.com/ashwin/nxtgauge-frontend-solid@sha256:861bd51cd1faeb2b1e72433256d2b349b7ec8750f0827aa074087a89a39eb97f