diff --git a/.gitea/workflows/build->develop.---myml b/.gitea/workflows/build->develop.yml similarity index 83% rename from .gitea/workflows/build->develop.---myml rename to .gitea/workflows/build->develop.yml index 7e2622c..4b2f9bc 100644 --- a/.gitea/workflows/build->develop.---myml +++ b/.gitea/workflows/build->develop.yml @@ -28,7 +28,7 @@ jobs: firstString=${{ github.ref_name }} secondString="develop" echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/build\//"$secondString"\/} - - name: GIT commit and push all changed files + - name: GIT commit diff env: CI_COMMIT_MESSAGE: converted to yml for review. CI_COMMIT_AUTHOR: Continuous Integration @@ -36,7 +36,5 @@ jobs: git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" git config --global user.email "username@users.noreply.github.com" git add -A - git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }} " - git checkout -b ${{ env.DEVELOPMENT_BRANCH }} - git merge --squash ${{ github.ref_name }} - git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }} + git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}" + ggit diff HEAD origin/${{ env.DEVELOPMENT_BRANCH }} \ No newline at end of file