diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0fe84301d1b5d40336bde30dce91475ee9586b05..82c70f5e05a26bc42bb1f256a4d218d25c388191 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -154,6 +154,7 @@ lint-front: ssh "eatfast@$DOMAIN" "cd /var/www/eatfast-website/backend && git stash && + git pull && git checkout "$CI_COMMIT_BRANCH" && git stash && git pull && @@ -161,8 +162,8 @@ lint-front: docker-compose up -d && exit" ; else - cd ./frontend - - echo 'REACT_APP_BASE_URL_BACK="https://eatfast.cs-campus.fr/api"' > .env; - - echo 'REACT_APP_BASE_URL_FRONT="https://eatfast.cs-campus.fr"' >> .env; + - echo 'REACT_APP_BASE_URL_BACK="https://$DOMAIN/api"' > .env; + - echo 'REACT_APP_BASE_URL_FRONT="https://$DOMAIN"' >> .env; - npm run build; - scp -r build/ eatfast@"$DOMAIN":/var/www/eatfast-website/frontend ; fi @@ -200,3 +201,32 @@ deploy-front-prod: IMAGE: "front" dependencies: - install-npm-packages + + +deploy-back-staging: + extends: .deploy + rules: + - if: $CI_PIPELINE_SOURCE == "merge_request_event" + when: never + - if: $CI_COMMIT_BRANCH + when: always + variables: + DOMAIN: eatfast.test.cs-campus.fr + PRIVATE_KEY: "$SSH_PRIVATE_KEY_STAGING" + IMAGE: "back" + dependencies: [] + + +deploy-front-staging: + extends: .deploy + rules: + - if: $CI_PIPELINE_SOURCE == "merge_request_event" + when: never + - if: $CI_COMMIT_BRANCH + when: always + variables: + DOMAIN: eatfast.test.cs-campus.fr + PRIVATE_KEY: "$SSH_PRIVATE_KEY_STAGING" + IMAGE: "front" + dependencies: + - install-npm-packages