From 67f5dabfa6f92c3a7f8b8b0c44e1cfc4b1000b55 Mon Sep 17 00:00:00 2001 From: Joey Kimsey Date: Mon, 12 Aug 2024 23:29:46 -0400 Subject: [PATCH] prevent runaway dependency branching --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2d1eb08..0ea9c5c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,6 +29,7 @@ composer_update: script: - git ${JOB_GIT_FLAGS} fetch origin ${TARGET_BRANCH} - git ${JOB_GIT_FLAGS} checkout ${TARGET_BRANCH} + - git reset --hard origin/main - export DATE_TIME="$(date '+%Y%m%d%H%M%S')" - export MR_BRANCH="${UPDATE_BRANCH_PREFIX}${DATE_TIME}" - git ${JOB_GIT_FLAGS} checkout -b "${MR_BRANCH}"