From 432611d4ee97cb763f13fa71d01bb21b7cee6bf6 Mon Sep 17 00:00:00 2001 From: Mathis Date: Sun, 15 Mar 2026 12:04:18 +0100 Subject: [PATCH] =?UTF-8?q?correction=20de=20bugs=20de=20l'auto-d=C3=A9plo?= =?UTF-8?q?iement?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- serveur_flask.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/serveur_flask.py b/serveur_flask.py index c942905..01ea1aa 100644 --- a/serveur_flask.py +++ b/serveur_flask.py @@ -33,16 +33,16 @@ def send_discord_log(status, message, color, author=None, commit_msg=None): except Exception as e: print(f"[!] Erreur envoi Discord : {e}") -def run_mep_logic(author, commit_msg): +def run_mep_logic(author, commit_msg, branch="main"): start_time = datetime.now() - send_discord_log("EN COURS", "Déploiement lancé sur la machine de guerre...", 3447003, author, commit_msg) + send_discord_log("EN COURS", f"Déploiement branch **{branch}** lancé sur la machine de guerre...", 3447003, author, commit_msg) try: os.chdir(PROJECT_PATH) # 1. GIT subprocess.run(["git", "fetch", "origin"], check=True) - subprocess.run(["git", "reset", "--hard", "origin/main"], check=True) + subprocess.run(["git", "reset", "--hard", f"origin/{branch}"], check=True) duration = (datetime.now() - start_time).total_seconds() msg = f"✅ **Déploiement réussi en {duration:.2f}s**\nLe bot est à jour et redémarré." @@ -70,8 +70,12 @@ def deploy(): author = data['commits'][0].get('author', {}).get('name', 'Inconnu') commit_msg = data['commits'][0].get('message', 'Pas de message') + # Extraction de la branche + ref = data.get('ref', 'refs/heads/main') + branch = ref.split('/')[-1] if ref else 'main' + # Threading pour répondre vite à GitLab - threading.Thread(target=run_mep_logic, args=(author, commit_msg)).start() + threading.Thread(target=run_mep_logic, args=(author, commit_msg, branch)).start() return {"status": "accepted"}, 202