Commit 26103b61 authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Merge remote-tracking branch 'origin/b24' into b24

parents 73a1785c 37059e58

data/formules/FORMULE_DAUPHINE.ods

+79.6 KiB (377 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

data/formules/FORMULE_DEFAUT.ods

0 → 100644
+185 KiB

File added.

No diff preview for this file type.

View file

data/formules/FORMULE_UGA.ods

0 → 100644
+200 KiB

File added.

No diff preview for this file type.

View file

module/Administration/src/Command/UpdateCodeCommand.php

+2 −0
Changes for module/Administration/src/Command/UpdateCodeCommand.php: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ class UpdateCodeCommand extends Command 


        // Récupération des sources

        $io->section("Mise à jour des fichiers à partir de GIT");

        $this->exec("git reset --hard"); // purge des modifs locales

        $tbr = $repo->tagIsValid($version) ? 'tags/' : '';

        if ($version == $repo->getCurrentBranche()) {

            $updcmd = 'git pull';
@@ -112,5 +113,6 @@ class UpdateCodeCommand extends Command 
        } catch (ProcessFailedException $exception) {

            throw new \RuntimeException('Erreur lors de l\'exécution de la commande : ' . $exception->getMessage());

        }

        

    }

}
 
 No newline at end of file