Skip to content
代码片段 群组 项目
提交 898f68a5 编辑于 作者: 路志远's avatar 路志远
浏览文件

Revert "Temp changes for testing Gemfile.lock"

This reverts commit 8da85459.
上级 8da85459
No related branches found
No related tags found
无相关合并请求
流水线 #3708571 已通过
......@@ -41,25 +41,9 @@ default:
fi
- |
if [ "$CI_JOB_NAME" = "gitlab-pre-main-jh" ]; then
echo "🍎0 Before merge ${MERGE_FROM_JH} - jh/Gemfile.lock"
grep gitlab-secret_detection jh/Gemfile.lock
echo "🍎0 Before merge ${MERGE_FROM_JH} - Gemfile.lock"
grep gitlab-secret_detection Gemfile.lock
[[ ! -z "$MERGE_FROM_JH" ]] && git merge "origin/${MERGE_FROM_JH}"
echo "🍎0 After merge ${MERGE_FROM_JH} - jh/Gemfile.lock"
grep gitlab-secret_detection jh/Gemfile.lock
echo "🍎0 After merge ${MERGE_FROM_JH} - Gemfile.lock"
grep gitlab-secret_detection Gemfile.lock
fi
- echo "🍎1 Before merge ${MERGE_FROM} - jh/Gemfile.lock"
- grep gitlab-secret_detection jh/Gemfile.lock
- echo "🍎1 Before merge ${MERGE_FROM} - Gemfile.lock"
- grep gitlab-secret_detection Gemfile.lock
- git merge "origin/${MERGE_FROM}" "${MERGE_OPTION}"
- echo "🍎1 After merge ${MERGE_FROM} - jh/Gemfile.lock"
- grep gitlab-secret_detection jh/Gemfile.lock
- echo "🍎1 After merge ${MERGE_FROM} - Gemfile.lock"
- grep gitlab-secret_detection Gemfile.lock
- |
if [ "$CI_JOB_NAME" = "gitlab" ] || [ "$CI_JOB_NAME" = "gitlab-pre-main-jh" ] || [ "$CI_JOB_NAME" = "gitlab-main-jh" ]; then
git checkout "origin/${MERGE_FROM}" .gitattributes
......@@ -101,19 +85,10 @@ gitlab:
- git commit -am "Update package.json and yarn.lock" || true
- mv ../vendor/ruby vendor/ || true
- ./jh/bin/merge_checksum
- echo "🍎2 Before adjust_gemfile_lock - jh/Gemfile.lock"
- grep gitlab-secret_detection jh/Gemfile.lock
- echo "🍎2 Before adjust_gemfile_lock - Gemfile.lock"
- grep gitlab-secret_detection Gemfile.lock
- ./jh/bin/adjust_gemfile_lock
- echo "🍎2 After adjust_gemfile_lock - jh/Gemfile.lock"
- grep gitlab-secret_detection jh/Gemfile.lock
- echo "🍎2 After adjust_gemfile_lock - Gemfile.lock"
- grep gitlab-secret_detection Gemfile.lock
- . scripts/utils.sh
- bundle_install_script
- git status
- git diff
- git commit -am "Update jh/Gemfile.lock" || true
- !reference [.sync, script]
- mv vendor ../
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册