Skip to content

Commit

Permalink
chore(ci): update release jobs
Browse files Browse the repository at this point in the history
  • Loading branch information
Stéphane committed Oct 24, 2023
1 parent 98b5726 commit 05a35b2
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/code-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: actions/setup-node@v3
with:
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Node.js
uses: actions/setup-node@v2
Expand All @@ -41,14 +41,6 @@ jobs:
run: |
git push origin v${{ steps.package-version.outputs.current-version }}
- name: Merge develop in main
uses: devmasx/merge-branch@master
with:
type: now
from_branch: develop
target_branch: main
github_token: ${{ secrets.GITHUB_TOKEN }}

- name: Update CHANGELOG
id: changelog
uses: requarks/changelog-action@v1
Expand All @@ -73,3 +65,11 @@ jobs:
branch: develop
commit_message: "docs: update CHANGELOG.md for v${{ steps.package-version.outputs.current-version }}"
file_pattern: CHANGELOG.md

- name: Merge develop in main
uses: devmasx/merge-branch@master
with:
type: now
from_branch: develop
target_branch: main
github_token: ${{ secrets.GITHUB_TOKEN }}

0 comments on commit 05a35b2

Please sign in to comment.