Skip to content

chore: replace Docker-based git-rebase-push-action with inline bash#238

Merged
JesperTerkelsen merged 1 commit intomainfrom
chore/deploy-workflows-arm64-no-docker
Feb 18, 2026
Merged

chore: replace Docker-based git-rebase-push-action with inline bash#238
JesperTerkelsen merged 1 commit intomainfrom
chore/deploy-workflows-arm64-no-docker

Conversation

@montabot
Copy link
Contributor

Summary

Replace Artur-Davtyan/git-rebase-push-action@v1 (Docker) with inline bash in deploy workflows.

Problem

The Docker action hardcodes yq_linux_amd64 in its Dockerfile, making it incompatible with ARM64 runners. This blocks migrating deploy workflows to linux-arm64.

Solution

Replace with equivalent inline bash that implements the same retry logic:

  1. Commit changes and attempt push
  2. On push failure: fetch latest, rebase on origin/main
  3. On rebase conflict: abort rebase, reset to origin/main, re-apply changes (same sed/yq commands), recommit
  4. Retry up to 10 times with 2s delay

Also removes Docker cleanup steps (sudo chown/sudo rm -rf) that were only needed because Docker actions create root-owned files.

Changed files

  • component-deploy.yml — used by deploy-generic.yml (kube-manifests based deploys)
  • component-deploy-v2.yml — used by deploy-generic-v2.yml (service-repo based deploys)

Testing

This PR keeps ubuntu-latest (x64) to validate the inline bash works before migrating to ARM64 in a follow-up.

Follow-up

Once verified, a separate PR will switch these + component-initialize.yml to linux-arm64.

🤖 Generated with Claude Code

Artur-Davtyan/git-rebase-push-action@v1 is a Docker action that
hardcodes yq_linux_amd64, making it incompatible with ARM64 runners.

Replace with equivalent inline bash that:
- Commits and pushes to main
- Retries up to 10 times on push failure
- Rebases on top of latest main
- Re-applies changes on rebase conflict (same sed/yq commands)

Also removes Docker cleanup steps (no longer needed since we're
not running a Docker action that creates root-owned files).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@JesperTerkelsen JesperTerkelsen merged commit b33733e into main Feb 18, 2026
1 check passed
@JesperTerkelsen JesperTerkelsen deleted the chore/deploy-workflows-arm64-no-docker branch February 18, 2026 19:10
JesperTerkelsen added a commit that referenced this pull request Feb 18, 2026
All ARM64 blockers have been resolved:
- slack-notifier-cli: ARM64 binary + TLS fix (v1.3.3)
- slack-notifier-cli-action: architecture detection (PR #18)
- git-rebase-push-action: replaced with inline bash (PR #238)
- argocd-wait-sync: architecture detection (PR #239)

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
JesperTerkelsen added a commit that referenced this pull request Feb 18, 2026
All ARM64 blockers have been resolved:
- slack-notifier-cli: ARM64 binary + TLS fix (v1.3.3)
- slack-notifier-cli-action: architecture detection (PR #18)
- git-rebase-push-action: replaced with inline bash (PR #238)
- argocd-wait-sync: architecture detection (PR #239)

Co-authored-by: Jesper Terkelsen <jete@monta.com>
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants