From ea30628ef8616e3963435bd0bffaf5cf017d5f99 Mon Sep 17 00:00:00 2001 From: Joey Kimsey Date: Mon, 12 Aug 2024 23:19:41 -0400 Subject: [PATCH] final fix --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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}"