diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e3bcaba..9860b18 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,10 +31,9 @@ composer_update: image: composer:latest interruptible: true # allows to stop the job if a newer pipeline starts, saving resources and allowing new jobs to start because job concurrency is limited script: - - pwd - git ${JOB_GIT_FLAGS} fetch origin ${TARGET_BRANCH} - git ${JOB_GIT_FLAGS} checkout ${TARGET_BRANCH} - - git reset --hard + - git reset --hard origin/main - git pull --allow-unrelated-histories - export DATE_TIME="$(date '+%Y%m%d%H%M%S')" - export MR_BRANCH="${UPDATE_BRANCH_PREFIX}${DATE_TIME}"