kkkkkkkkkkkksssssssssssssswdwdwdw
build-develop-branch / build-branch (push) Has been skipped Details
convert-to-yml / develop-branch (push) Failing after 22s Details

This commit is contained in:
giles 2023-10-22 01:56:22 +01:00
parent bedb5686db
commit 3d34a9db47
1 changed files with 6 additions and 6 deletions

View File

@ -24,13 +24,13 @@ jobs:
- name: clone - name: clone
run: | run: |
git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
git -C ../cloned remote -v
git -C ../cloned push origin HEAD
mv ../cloned/.git .. mv ../cloned/.git ..
rm -rf ../cloned rm -rf ../cloned
cp -r . ../cloned cp -r . ../cloned
rm -rf ../cloned/.git rm -rf ../cloned/.git
mv ../.git ../cloned mv ../.git ../cloned
rm -rf .
mv ../cloned .
- name: GIT commit and push all changed files - name: GIT commit and push all changed files
env: env:
CI_COMMIT_MESSAGE: Continuous Integration Build Artifacts CI_COMMIT_MESSAGE: Continuous Integration Build Artifacts
@ -39,10 +39,10 @@ jobs:
git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}"
git config --global user.email "username@users.noreply.github.com" git config --global user.email "username@users.noreply.github.com"
git config pull.rebase false git config pull.rebase false
git -C ../cloned checkout -b ${{ env.PRODUCTION_BRANCH }} git checkout -b ${{ env.PRODUCTION_BRANCH }}
git -C ../cloned add -A git add -A
git -C ../cloned 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 -C ../cloned push -f origin 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