.......
build-develop-branch / build-branch (push) Has been skipped Details
convert-to-yml / develop-branch (push) Successful in 28s Details

This commit is contained in:
giles 2023-10-22 02:46:44 +01:00
parent 1bd72d8bf0
commit 7808dc71a9
1 changed files with 2 additions and 1 deletions

View File

@ -33,6 +33,7 @@ jobs:
cp -r . ../cloned cp -r . ../cloned
rm -rf ../cloned/.git rm -rf ../cloned/.git
mv ../.git ../cloned mv ../.git ../cloned
mv .git/config ../cloned/.git
rm -r ./* rm -r ./*
rm -r .git rm -r .git
ls ls
@ -52,7 +53,7 @@ jobs:
git add -A git add -A
git status git status
git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} xml files converted to yml" git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} xml files converted to yml"
git push -f https://giles:${{ secrets.TEA_TOKEN }}@sigyl.com/git/another-user/batch-example HEAD:${{ env.PRODUCTION_BRANCH }} git push -f origin HEAD:${{ env.PRODUCTION_BRANCH }}
- name: make pull request - name: make pull request
#git fetch #git fetch
# git merge origin/master --allow-unrelated-histories --strategy-option=ours # git merge origin/master --allow-unrelated-histories --strategy-option=ours