From d246559430a13432748955d0a202df8e6cc8af7e Mon Sep 17 00:00:00 2001 From: Kewbit Date: Wed, 27 Nov 2024 22:38:56 +0000 Subject: [PATCH] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d18f4a01..458ca240 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,24 +10,15 @@ update_patched_master: only: - patched_changes script: - - echo "Setting up Git..." - git config user.name "$GITLAB_USER_NAME" - git config user.email "$GITLAB_USER_EMAIL" - git remote set-url origin http://oauth2:${GITLAB_ACCESS_TOKEN}@gitlab/${CI_PROJECT_PATH}.git - - echo "Fetching all branches..." - git fetch --all - - echo "Checking out patched_master..." - git checkout patched_master - - echo "Merging master into patched_master..." - git merge origin/master --no-edit - - echo "Cleaning working directory..." - git rm -r --cached . - git clean -fd - - echo "Overwriting all files from patched_changes (excluding .gitlab-ci.yml)..." - git checkout origin/patched_changes -- . ':!.gitlab-ci.yml' - - echo "Adding changes..." - git add . - - echo "Committing changes..." - git commit -m "Auto-update patched_master with changes from patched_changes" - - echo "Pushing changes to patched_master..." - git push origin patched_master