Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Verified Commit a5f05efc authored by Nicolas Gelot's avatar Nicolas Gelot
Browse files

Use git fetch insted of git pull for deployment

parent 99b08ba7

.gitlab-ci.yml

+4 −4
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ test:unit: 
    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY

  script:

    - echo "Deploying to ($SSH_USER@$BACKEND_HOST)"

    - ssh $SSH_USER@$BACKEND_HOST "cd $DEPLOYMENT_PATH && git stash && git pull && git checkout $BRANCH && rm .env .env.prod && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml"

    - ssh $SSH_USER@$BACKEND_HOST "cd $DEPLOYMENT_PATH && git stash && git fetch && git checkout $BRANCH && git reset --hard origin/$BRANCH && rm .env .env.prod && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml"

    - scp $ENV_FILE $SSH_USER@$BACKEND_HOST:$DEPLOYMENT_PATH/.env

    - ssh $SSH_USER@$BACKEND_HOST "cd $DEPLOYMENT_PATH

      && sed -i 's/SPOT_DOCKER_TAG=master/SPOT_DOCKER_TAG=$SPOT_DOCKER_TAG/g' .env