Skip to content

Commit

Permalink
Merge pull request #5 from seznam/pomo/release
Browse files Browse the repository at this point in the history
fix: prettify ci workflow
  • Loading branch information
Drakorgaur authored Apr 18, 2024
2 parents db81f0d + af2b335 commit 22c8f0a
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 5 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/bump_version.yaml
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
on:
pull_request:
push:
branches:
- main
types: [closed]
- release

name: Bump version and create changelog

jobs:
bump_version:
if: ${{ github.event.pull_request.merged }}
runs-on: ubuntu-latest
name: "Bump version and create changelog with commitizen"
steps:
- name: Check out
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
token: "${{ secrets.PERSONAL_ACCESS_TOKEN }}"
ref: main
- id: cz
name: Create bump and changelog
uses: commitizen-tools/commitizen-action@master
Expand Down
21 changes: 21 additions & 0 deletions .github/workflows/trigger_release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Merge master into release branch to trigger release

on:
pull_request:
types:
- closed

jobs:
sync-branch:
if: github.event.pull_request.merged == true
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master

- name: Merge development -> staging
uses: devmasx/merge-branch@master
with:
type: now
from_branch: main
target_branch: release
github_token: "${{ secrets.PERSONAL_ACCESS_TOKEN }}"

0 comments on commit 22c8f0a

Please sign in to comment.