Browse Source

test gitlab-ci.yml

Guillermo Espinoza 6 years ago
parent
commit
a9afbecf3c
2 changed files with 7 additions and 9 deletions
  1. 2 2
      .gitlab-ci.yml
  2. 5 7
      tools/src/Command/TagModulesCommand.php

+ 2 - 2
.gitlab-ci.yml

@@ -69,9 +69,9 @@ installer_tag:
     - cd tools
     - composer install --no-interaction --no-progress
     - php cmd.php make:installImages $(pwd) --client='develop' --develop=1
-    - chmod 0600 keys/bitbucket.id_rsa ; eval $(ssh-agent); ssh-add keys/bitbucket.id_rsa ; php cmd.php make:tag:vendors repositories.ini ${CI_COMMIT_TAG} --branch=1
+    #- chmod 0600 keys/bitbucket.id_rsa ; eval $(ssh-agent); ssh-add keys/bitbucket.id_rsa ; php cmd.php make:tag:vendors repositories.ini ${CI_COMMIT_TAG} --branch=1
     - chmod 0600 keys/bitbucket.id_rsa ; eval $(ssh-agent); ssh-add keys/bitbucket.id_rsa ; php cmd.php get:source git.ini --timeout=120
-    - chmod 0600 keys/bitbucket.id_rsa ; eval $(ssh-agent); ssh-add keys/bitbucket.id_rsa ; php cmd.php composer:require git.ini 'ik/*' ${CI_COMMIT_TAG} --composer_update=0
+    #- chmod 0600 keys/bitbucket.id_rsa ; eval $(ssh-agent); ssh-add keys/bitbucket.id_rsa ; php cmd.php composer:require git.ini 'ik/*' ${CI_COMMIT_TAG} --composer_update=0
     - chmod 0600 keys/bitbucket.id_rsa ; eval $(ssh-agent); ssh-add keys/bitbucket.id_rsa ; php cmd.php make:tag:modules git.ini ${CI_COMMIT_TAG}
   only:
     refs:

+ 5 - 7
tools/src/Command/TagModulesCommand.php

@@ -95,15 +95,13 @@ class TagModulesCommand extends Command
 
                     if ($flag == false) {
                         $output->writeln('No hay cambios en el repositorio');
-
-                        continue;
+                    } else {
+                        $output->writeln('Commit de los composer');
+                        $command = $cd_path . "; git commit -am 'Composer para la version " . $version . " y el tag " . $tag . "'";
+                        $output->writeln("\t" . $command);
+                        shell_exec($command);
                     }
 
-                    $output->writeln('Commit de los composer');
-                    $command = $cd_path . "; git commit -am 'Composer para la version " . $version . " y el tag " . $tag . "'";
-                    $output->writeln("\t" . $command);
-                    shell_exec($command);
-
                     // cambio a la rama de la version y agrego los archivos modificados
                     $output->writeln('Checkout de la rama ' . $version);
                     $git->checkout($version);