2025-03-29 11:48:50 +00:00
parent a6ded9245f
commit 1bd8c2f348
1 changed files with 19 additions and 0 deletions
						
						
							
						
						
						
@@ -11,6 +11,7 @@ stages:
  - build
  - build
  - docker
  - docker
  - deploy
  - deploy
  - sync
cache:
cache:
  key: ${CI_COMMIT_REF_SLUG}
  key: ${CI_COMMIT_REF_SLUG}
						
							
						
						
							
						
						
						
@@ -94,3 +95,21 @@ deploy:
  only:
  only:
    - dev
    - dev
    - production
    - production
# ------------------ New sync job added below ------------------
sync_branches:
  stage: sync
  image: alpine/git:latest
  rules:
    - if: '$CI_COMMIT_BRANCH == "production"'
  script:
    - |
      git config --global user.email "gitlab-ci@rheinsw.com"
      git config --global user.name "RheinSW GitLab CI"
      git remote set-url origin "https://oauth2:${CI_JOB_TOKEN}@${CI_SERVER_HOST}/${CI_PROJECT_PATH}.git"
      git checkout dev
      git pull origin dev
      git merge --no-ff origin/production
      git push origin dev