diff --git a/.github/workflows/fast_forward.yml b/.github/workflows/fast_forward.yml index 0bdd0c90..56b99588 100644 --- a/.github/workflows/fast_forward.yml +++ b/.github/workflows/fast_forward.yml @@ -5,7 +5,7 @@ on: jobs: fast_forward_job: name: Fast Forward - if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/fast-forward') + if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/fast-forward') runs-on: ubuntu-latest steps: # To use this repository's private action, you must check out the repository @@ -17,7 +17,7 @@ jobs: uses: ./ with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - success_message: 'Success! Fast forwarded ***target_base*** to ***source_head***! ```git checkout target_base && git merge source_head --ff-only``` ' + success_message: 'Success! Fast forwarded ***source_head*** to ***target_base***! ```git checkout target_base && git merge source_head --ff-only``` ' failure_message: 'Failed! Cannot do fast forward!' # Advanced use case example # - name: Fast Forward PR @@ -25,10 +25,10 @@ jobs: # uses: ./ # with: # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # success_message: 'Success! Fast forwarded ***target_base*** to ***source_head***! ```git checkout target_base && git merge source_head --ff-only``` ' + # success_message: 'Success! Fast forwarded ***source_head*** to ***target_base***! ```git checkout target_base && git merge source_head --ff-only``` ' # failure_message: 'Failed! Cannot do fast forward!' # update_status: true # failure_message_same_stage_and_prod: 'Failed! Possible reasons: ***1)Your feature branch ```source_head``` is outdated***. You need to rebase ```git checkout source_head && git pull --rebase origin prod_branch && git push --force``` ***2)Review required***, pull-request is not approved ***3)Checks were not successful*** (build status check failed)' # failure_message_diff_stage_and_prod: 'Failed! Possible reasons: ***1)```stage_branch``` is currently in use***. Another feature validation is ongoing. You need to wait. Later, when integration finishes, you will need to rebase ```git checkout source_head && git pull --rebase origin prod_branch && git push --force``` ***2)Review required***, pull-request is not approved ***3)Checks were not successful*** (build status check failed)' # production_branch: 'master' - # staging_branch: 'staging' \ No newline at end of file + # staging_branch: 'staging'