hopefully this will sort it
build-develop-branch / build-branch (push) Has been skipped Details
convert-to-yml / develop-branch (push) Failing after 45s Details

This commit is contained in:
giles 2023-10-22 10:32:04 +01:00
parent 78e6bbc80f
commit 5ef777109e
1 changed files with 0 additions and 13 deletions

View File

@ -35,19 +35,6 @@ jobs:
converted from batch" converted from batch"
git merge origin/master --strategy-option=ours --allow-unrelated git merge origin/master --strategy-option=ours --allow-unrelated
git push -f origin HEAD:${{ env.DEVELOPMENT_BRANCH }} git push -f origin HEAD:${{ env.DEVELOPMENT_BRANCH }}
- name: GIT commit and push all changed files
env:
CI_COMMIT_MESSAGE: Continuous Integration Build Artifacts
CI_COMMIT_AUTHOR: Continuous Integration
run: |
git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}"
git config --global user.email "username@users.noreply.github.com"
git checkout -b ${{ env.DEVELOPMENT_BRANCH }}
git add -A
git status
git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} xml files converted to yml"
git push -f origin HEAD:${{ env.DEVELOPMENT_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