Skip to content

Commit

Permalink
Update master_sync.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
IgorMirosavljevicHTEC authored Aug 23, 2024
1 parent d5d9ef1 commit ecfa39d
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions .github/workflows/master_sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ on:
workflow_dispatch:

jobs:
createPullRequest:
name: Update and create pull request
SyncAndMerge:
name: Sync master and merge develop
runs-on: ubuntu-latest
steps:

Expand All @@ -17,10 +17,11 @@ jobs:
fetch-depth: '0'

- name: Merge Fast Forward Only
uses: IgorMirosavljevicHTEC/[email protected]
with:
branchtomerge: develop
branch: master
env:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

run: |
git checkout master
git merge origin/develop --ff-only
git push origin HEAD

0 comments on commit ecfa39d

Please sign in to comment.