diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c5b6229b..263025f7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,8 +28,8 @@ services: before_script: - apk update - - coman=$(ls && pwd) - - echo "'$coman'" + - command=$(ls && pwd) + - echo "'$command'" - cp .env.example .env - composer install - php artisan key:generate @@ -49,7 +49,7 @@ test: - sed -i "s/DB_PASSWORD=/DB_PASSWORD=$MYSQL_ROOT_PASSWORD/" .env.testing - cat .env.testing - php artisan key:generate --env=testing - - php artisan migrate --env=testing --force + - php artisan migrate --path=/database/old_migrations/ --path=database/migrations --env=testing --force - php artisan test rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' @@ -71,21 +71,21 @@ test: when: always allow_failure: true -deploy: - stage: deploy - script: - - apt-get update && add --no-cache openssh-client - - chmod og-rwx $ID_RSA - - ssh -i $ID_RSA -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP " - echo -e '$SHECAN_DNS' | sudo tee /etc/resolv.conf && - dns=\$(cat /etc/resolv.conf) && - echo \"\$dns\" && - cd $PROJECT_PATH && - git checkout $TARGET_BRANCH_NAME && - ssh -T git@gitlab.com && - git pull ssh-origin $TARGET_BRANCH_NAME && - echo -e '$DEFAULT_DNS' | sudo tee /etc/resolv.conf" - resource_group: develop_deploy - rules: - - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_REF_NAME == "develop"' +#deploy: +# stage: deploy +# script: +# - apt-get update && add --no-cache openssh-client +# - chmod og-rwx $ID_RSA +# - ssh -i $ID_RSA -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP " +# echo -e '$SHECAN_DNS' | sudo tee /etc/resolv.conf && +# dns=\$(cat /etc/resolv.conf) && +# echo \"\$dns\" && +# cd $PROJECT_PATH && +# git checkout $TARGET_BRANCH_NAME && +# ssh -T git@gitlab.com && +# git pull ssh-origin $TARGET_BRANCH_NAME && +# echo -e '$DEFAULT_DNS' | sudo tee /etc/resolv.conf" +# resource_group: develop_deploy +# rules: +# - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_REF_NAME == "develop"'