Skip to content
代码片段 群组 项目
未验证 提交 b6eb6002 编辑于 作者: Peter Leitzen's avatar Peter Leitzen
浏览文件

CI: Allow empty commits when FOSS branch is prepared

The option `--allow-empty` accounts for the edge case where FOSS
matchess EE repository and a merge request only contains EE related
changes.
上级 e3feb016
No related branches found
No related tags found
无相关合并请求
...@@ -15,6 +15,7 @@ prepare-as-if-foss-branch: ...@@ -15,6 +15,7 @@ prepare-as-if-foss-branch:
before_script: before_script:
- git clone --single-branch --branch master "${FOSS_REPOSITORY}" gitlab-foss - git clone --single-branch --branch master "${FOSS_REPOSITORY}" gitlab-foss
- git -C gitlab-foss checkout -b "${AS_IF_FOSS_BRANCH}" master - git -C gitlab-foss checkout -b "${AS_IF_FOSS_BRANCH}" master
- git -C gitlab-foss rev-parse HEAD
- rm -r .git/ - rm -r .git/
- mv gitlab-foss/.git . - mv gitlab-foss/.git .
- rm -r gitlab-foss - rm -r gitlab-foss
...@@ -29,7 +30,9 @@ prepare-as-if-foss-branch: ...@@ -29,7 +30,9 @@ prepare-as-if-foss-branch:
- rm -f CHANGELOG-EE.md - rm -f CHANGELOG-EE.md
- rm -f changelogs/*-ee.md - rm -f changelogs/*-ee.md
- git add -A - git add -A
- git commit -m 'Update from merge request' # TODO: Mark which SHA we add # --allow-empty accounts for the edge case where FOSS matchess EE repository
# and a merge request only contains EE related changes.
- git commit -m 'Update from merge request' --allow-empty # TODO: Mark which SHA we add
- git push -f "${FOSS_REPOSITORY}" "${AS_IF_FOSS_BRANCH}" - git push -f "${FOSS_REPOSITORY}" "${AS_IF_FOSS_BRANCH}"
prepare-as-if-foss-env: prepare-as-if-foss-env:
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册