Skip to content

Removed white spaces and fixed order #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
miroljub1995 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Removed white spaces and fixed order #42

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17acafc
Removed whitespaces
miroljub1995 Sep 1, 2022
3adf4b3
Fix order
miroljub1995 Sep 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/fast_forward.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -17,18 +17,18 @@ 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
# id: ff-action
# 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'
# staging_branch: 'staging'