Gitlab-Migration/rhein-sw-website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use Node image and streamline Git configuration steps

Browse Source
This commit is contained in:
Thatsaphorn
2025-03-29 13:51:16 +01:00
parent 44457e43e6
commit 8b39c5f8c9
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
.gitlab-ci.yml
View File

@@ -100,16 +100,15 @@ deploy:
sync_branches: sync_branches:
stage: sync stage: sync
image: alpine/git:latest image: node:20 # <-- reuse existing node image
rules: rules:
- if: '$CI_COMMIT_BRANCH == "production"' - if: '$CI_COMMIT_BRANCH == "production"'
before_script:
- git config --global user.email "gitlab-ci@rheinsw.com"
- git config --global user.name "GitLab CI"
script: script:
- | - git remote set-url origin "https://oauth2:${CI_JOB_TOKEN}@${CI_SERVER_HOST}/${CI_PROJECT_PATH}.git"
git config --global user.email "gitlab-ci@rheinsw.com" - git checkout dev
git config --global user.name "RheinSW GitLab CI" - git pull origin dev
git remote set-url origin "https://oauth2:${CI_JOB_TOKEN}@${CI_SERVER_HOST}/${CI_PROJECT_PATH}.git" - git merge --no-ff origin/production
- git push origin dev
git checkout dev
git pull origin dev
git merge --no-ff origin/production
git push origin dev