Skip to content

Commit

Permalink
chore: fix github actions
Browse files Browse the repository at this point in the history
  • Loading branch information
dbudzins committed Nov 30, 2023
1 parent b618efa commit c714fa9
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 10 deletions.
24 changes: 24 additions & 0 deletions .github/workflows/release-merge-back.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Release - Merge Back to Dev
on:
workflow_run:
workflows: ['Release - Tag, Build Artifacts, and Release']
branches: [release]
types:
- completed
workflow_dispatch:

jobs:
merge-back:
if: ${{ !github.event.workflow_run || github.event.workflow_run.conclusion == 'success' }}

runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master

- name: Merge release -> develop
uses: devmasx/merge-branch@master
with:
type: now
target_branch: develop
message: 'chore: merge release to develop'
github_token: ${{ secrets.ACTION_TOKEN }}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Release - Build Artifacts, Tag, Release, and Merge Back
name: Release - Tag, Build Artifacts, and Release

on:
workflow_dispatch:
Expand Down Expand Up @@ -55,12 +55,3 @@ jobs:
tag: v${{ steps.package-version.outputs.current-version }}
bodyFile: '.github/RELEASE_BODY_TEMPLATE.md'
token: ${{ secrets.github_token }}

- name: Merge release -> develop
uses: devmasx/merge-branch@master
with:
type: now
target_branch: develop
message: 'chore: merge release to develop'
github_token: ${{ secrets.ACTION_TOKEN }}

0 comments on commit c714fa9

Please sign in to comment.