another-user
/
batch-example
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 143 Wiki Activity

Merge pull request 'runna diff on build and development' (#134) from develop/hrereare into master 

Reviewed-on: #134
This commit is contained in:
giles 2023-10-23 09:08:14 +00:00
parent 5a05cbf1d0 0f392d1cbf
commit bb0c9c7a89
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitea/workflows/build->develop.---myml → .gitea/workflows/build->develop.yml
View File

@ -28,7 +28,7 @@ jobs:
firstString=${{ github.ref_name }} firstString=${{ github.ref_name }}
secondString="develop" secondString="develop"
echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/build\//"$secondString"\/} echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/build\//"$secondString"\/}
- name: GIT commit and push all changed files - name: GIT commit diff
env: env:
CI_COMMIT_MESSAGE: converted to yml for review. CI_COMMIT_MESSAGE: converted to yml for review.
CI_COMMIT_AUTHOR: Continuous Integration CI_COMMIT_AUTHOR: Continuous Integration
@ -36,7 +36,5 @@ 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 add -A git add -A
git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }} " git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}"
git checkout -b ${{ env.DEVELOPMENT_BRANCH }} ggit diff HEAD origin/${{ env.DEVELOPMENT_BRANCH }}
git merge --squash ${{ github.ref_name }}
git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }}