Skip to content

fix(ci): back-merge via PR instead of direct push to develop#92

Merged
samuelds merged 1 commit into
developfrom
fix/back-merge-via-pr
Apr 29, 2026
Merged

fix(ci): back-merge via PR instead of direct push to develop#92
samuelds merged 1 commit into
developfrom
fix/back-merge-via-pr

Conversation

@samuelds
Copy link
Copy Markdown
Contributor

Problème

Le workflow back-merge.yml faisait un git push origin develop direct, bloqué par le ruleset develop protection (erreur GH013).

Solution

Remplacement du push direct par une approche PR :

  1. Création d'une branche chore/back-merge-<sha>
  2. Push de cette branche
  3. Ouverture d'une PR vers develop
  4. Activation de l'auto-merge squash (gh pr merge --squash --auto)

Le ruleset develop a required_approving_review_count: 0, donc l'auto-merge se déclenche dès que la CI passe.

Changements

  • Ajout permission pull-requests: write
  • Step "Check if already up to date" extrait (logique inchangée)
  • Step "Push develop" → remplacé par "Push back-merge branch" + "Open PR and enable auto-merge"
  • Variables d'environnement pour toutes les expressions GitHub (sécurité CI)

🤖 Generated with Claude Code

Replace direct `git push origin develop` with a PR-based approach
to comply with the develop branch ruleset (GH013 error). Now creates
a `chore/back-merge-<sha>` branch, pushes it, opens a PR, and
enables auto-merge (squash) so it merges once CI passes.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@samuelds samuelds merged commit 76516c0 into develop Apr 29, 2026
10 checks passed
@samuelds samuelds deleted the fix/back-merge-via-pr branch April 30, 2026 07:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant